From 5eae361ff57ae5415958fae6ea497dae68a41bc1 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:17 -0400 Subject: [PATCH 01/30] ci: Prefer constant for test string literals --- .ci/.semgrep-test-constants.yml | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/.ci/.semgrep-test-constants.yml b/.ci/.semgrep-test-constants.yml index b6b7a710709a..432f45f39d5e 100644 --- a/.ci/.semgrep-test-constants.yml +++ b/.ci/.semgrep-test-constants.yml @@ -111,6 +111,33 @@ rules: pattern: '"key2"' severity: ERROR fix: "acctest.CtKey2" + - id: literal-Name-string-test-constant + languages: [go] + message: Use the constant `acctest.CtName` for the string literal "name" in test files + paths: + include: + - "internal/service/**/*_test.go" + pattern: '"name"' + severity: ERROR + fix: "acctest.CtName" + - id: literal-OverlapKey1-string-test-constant + languages: [go] + message: Use the constant `acctest.CtOverlapKey1` for the string literal "overlapkey1" in test files + paths: + include: + - "internal/service/**/*_test.go" + pattern: '"overlapkey1"' + severity: ERROR + fix: "acctest.CtOverlapKey1" + - id: literal-ProviderKey1-string-test-constant + languages: [go] + message: Use the constant `acctest.CtProviderKey1` for the string literal "providerkey1" in test files + paths: + include: + - "internal/service/**/*_test.go" + pattern: '"providerkey1"' + severity: ERROR + fix: "acctest.CtProviderKey1" - id: literal-ProviderTags-string-test-constant languages: [go] message: Use the constant `acctest.CtProviderTags` for the string literal "provider_tags" in test files @@ -138,6 +165,24 @@ rules: pattern: '"rName"' severity: ERROR fix: "acctest.CtRName" + - id: literal-ResourceKey1-string-test-constant + languages: [go] + message: Use the constant `acctest.CtResourceKey1` for the string literal "resourcekey1" in test files + paths: + include: + - "internal/service/**/*_test.go" + pattern: '"resourcekey1"' + severity: ERROR + fix: "acctest.CtResourceKey1" + - id: literal-ResourceTags-string-test-constant + languages: [go] + message: Use the constant `acctest.CtResourceTags` for the string literal "resource_tags" in test files + paths: + include: + - "internal/service/**/*_test.go" + pattern: '"resource_tags"' + severity: ERROR + fix: "acctest.CtResourceTags" - id: literal-ResourceValue1-string-test-constant languages: [go] message: Use the constant `acctest.CtResourceValue1` for the string literal "resourcevalue1" in test files From a1403728d6948dbb18bb573970bb38033208ab79 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:17 -0400 Subject: [PATCH 02/30] acctest: Add constant for test string literals --- internal/acctest/consts.csv | 5 +++++ internal/acctest/consts_gen.go | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/internal/acctest/consts.csv b/internal/acctest/consts.csv index 7b671f2f988f..206e106c05e6 100644 --- a/internal/acctest/consts.csv +++ b/internal/acctest/consts.csv @@ -10,9 +10,14 @@ basic,Basic false,False key1,Key1 key2,Key2 +name,Name +overlapkey1,OverlapKey1 provider_tags,ProviderTags +providerkey1,ProviderKey1 providervalue1,ProviderValue1 rName,RName +resource_tags,ResourceTags +resourcekey1,ResourceKey1 resourcevalue1,ResourceValue1 resourcevalue2,ResourceValue2 rule.#,RulePound diff --git a/internal/acctest/consts_gen.go b/internal/acctest/consts_gen.go index d5703b4aab4a..ba2aa46a54e9 100644 --- a/internal/acctest/consts_gen.go +++ b/internal/acctest/consts_gen.go @@ -20,9 +20,14 @@ const ( CtFalseCaps = "FALSE" CtKey1 = "key1" CtKey2 = "key2" + CtName = "name" + CtOverlapKey1 = "overlapkey1" + CtProviderKey1 = "providerkey1" CtProviderTags = "provider_tags" CtProviderValue1 = "providervalue1" CtRName = "rName" + CtResourceKey1 = "resourcekey1" + CtResourceTags = "resource_tags" CtResourceValue1 = "resourcevalue1" CtResourceValue2 = "resourcevalue2" CtRulePound = "rule.#" @@ -53,9 +58,14 @@ func ConstOrQuote(constant string) string { "FALSE": "CtFalseCaps", "key1": "CtKey1", "key2": "CtKey2", + "name": "CtName", + "overlapkey1": "CtOverlapKey1", + "providerkey1": "CtProviderKey1", "provider_tags": "CtProviderTags", "providervalue1": "CtProviderValue1", "rName": "CtRName", + "resourcekey1": "CtResourceKey1", + "resource_tags": "CtResourceTags", "resourcevalue1": "CtResourceValue1", "resourcevalue2": "CtResourceValue2", "rule.#": "CtRulePound", From 0896e3680383d6e5b5aadac0b836ba1ae03e5675 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:18 -0400 Subject: [PATCH 03/30] accessanalyzer: Use constants for test strings --- .../accessanalyzer/analyzer_tags_gen_test.go | 224 +++++++++--------- 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/internal/service/accessanalyzer/analyzer_tags_gen_test.go b/internal/service/accessanalyzer/analyzer_tags_gen_test.go index 3cbb68a92f71..3cc61720c15c 100644 --- a/internal/service/accessanalyzer/analyzer_tags_gen_test.go +++ b/internal/service/accessanalyzer/analyzer_tags_gen_test.go @@ -55,7 +55,7 @@ func testAccAccessAnalyzerAnalyzer_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -83,7 +83,7 @@ func testAccAccessAnalyzerAnalyzer_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -95,7 +95,7 @@ func testAccAccessAnalyzerAnalyzer_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -127,7 +127,7 @@ func testAccAccessAnalyzerAnalyzer_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -140,7 +140,7 @@ func testAccAccessAnalyzerAnalyzer_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -168,7 +168,7 @@ func testAccAccessAnalyzerAnalyzer_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -180,7 +180,7 @@ func testAccAccessAnalyzerAnalyzer_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -201,7 +201,7 @@ func testAccAccessAnalyzerAnalyzer_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -227,7 +227,7 @@ func testAccAccessAnalyzerAnalyzer_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -250,7 +250,7 @@ func testAccAccessAnalyzerAnalyzer_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -262,7 +262,7 @@ func testAccAccessAnalyzerAnalyzer_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -287,7 +287,7 @@ func testAccAccessAnalyzerAnalyzer_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -308,7 +308,7 @@ func testAccAccessAnalyzerAnalyzer_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -336,7 +336,7 @@ func testAccAccessAnalyzerAnalyzer_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -364,7 +364,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -391,7 +391,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -403,7 +403,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -424,7 +424,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -450,7 +450,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -478,7 +478,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -508,7 +508,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -521,7 +521,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -549,7 +549,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -577,7 +577,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -605,7 +605,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -632,7 +632,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -663,7 +663,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -692,7 +692,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -707,7 +707,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -740,7 +740,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -754,7 +754,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -784,7 +784,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -795,7 +795,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -818,7 +818,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -845,10 +845,10 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -856,22 +856,22 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -882,10 +882,10 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -898,10 +898,10 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -910,12 +910,12 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -923,12 +923,12 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -940,10 +940,10 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -956,7 +956,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -979,7 +979,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1006,10 +1006,10 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1017,20 +1017,20 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1041,10 +1041,10 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1057,11 +1057,11 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1070,11 +1070,11 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1082,11 +1082,11 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1098,11 +1098,11 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1116,10 +1116,10 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1127,20 +1127,20 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1151,10 +1151,10 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1181,7 +1181,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_updateToProviderOnly(t *test ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1216,7 +1216,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_updateToProviderOnly(t *test acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -1246,7 +1246,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_updateToProviderOnly(t *test acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1275,7 +1275,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_updateToResourceOnly(t *test acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -1301,7 +1301,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_updateToResourceOnly(t *test ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1333,7 +1333,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_updateToResourceOnly(t *test ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1364,7 +1364,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_emptyResourceTag(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1398,7 +1398,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_emptyResourceTag(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1429,7 +1429,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_emptyProviderOnlyTag(t *test acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &v), @@ -1457,7 +1457,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_emptyProviderOnlyTag(t *test acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1486,7 +1486,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nullOverlappingResourceTag(t acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1517,7 +1517,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nullOverlappingResourceTag(t acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1546,10 +1546,10 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nullNonOverlappingResourceTa ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1558,7 +1558,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nullNonOverlappingResourceTa 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1566,7 +1566,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nullNonOverlappingResourceTa 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1577,10 +1577,10 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nullNonOverlappingResourceTa ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1661,7 +1661,7 @@ func testAccAccessAnalyzerAnalyzer_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1751,7 +1751,7 @@ func testAccAccessAnalyzerAnalyzer_tags_ComputedTag_OnUpdate_Replace(t *testing. ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, From 406a10f5f3f79945a701ed9e942becc9476166ad Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:18 -0400 Subject: [PATCH 04/30] acm: Use constants for test strings --- .../service/acm/certificate_tags_gen_test.go | 224 +++++++++--------- internal/service/acm/certificate_test.go | 8 +- 2 files changed, 116 insertions(+), 116 deletions(-) diff --git a/internal/service/acm/certificate_tags_gen_test.go b/internal/service/acm/certificate_tags_gen_test.go index 3d0e000306c6..8aef0264541c 100644 --- a/internal/service/acm/certificate_tags_gen_test.go +++ b/internal/service/acm/certificate_tags_gen_test.go @@ -32,7 +32,7 @@ func TestAccACMCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -61,7 +61,7 @@ func TestAccACMCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -77,7 +77,7 @@ func TestAccACMCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -110,7 +110,7 @@ func TestAccACMCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -127,7 +127,7 @@ func TestAccACMCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -156,7 +156,7 @@ func TestAccACMCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -172,7 +172,7 @@ func TestAccACMCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -194,7 +194,7 @@ func TestAccACMCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -225,7 +225,7 @@ func TestAccACMCertificate_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), @@ -249,7 +249,7 @@ func TestAccACMCertificate_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), @@ -265,7 +265,7 @@ func TestAccACMCertificate_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -292,7 +292,7 @@ func TestAccACMCertificate_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -314,7 +314,7 @@ func TestAccACMCertificate_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -343,7 +343,7 @@ func TestAccACMCertificate_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -376,7 +376,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -404,7 +404,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -420,7 +420,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -442,7 +442,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -473,7 +473,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnUpdate_Add(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -502,7 +502,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnUpdate_Add(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -533,7 +533,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnUpdate_Add(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -550,7 +550,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnUpdate_Add(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -579,7 +579,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnUpdate_Add(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -612,7 +612,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -641,7 +641,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -669,7 +669,7 @@ func TestAccACMCertificate_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -705,7 +705,7 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -735,7 +735,7 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -754,7 +754,7 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -788,7 +788,7 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -806,7 +806,7 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -837,7 +837,7 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -852,7 +852,7 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -876,7 +876,7 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -908,10 +908,10 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -921,22 +921,22 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -946,10 +946,10 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -966,10 +966,10 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -980,12 +980,12 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -993,12 +993,12 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1009,10 +1009,10 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1029,7 +1029,7 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1053,7 +1053,7 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1085,10 +1085,10 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1098,20 +1098,20 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1121,10 +1121,10 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1141,11 +1141,11 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1156,11 +1156,11 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1168,11 +1168,11 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1183,11 +1183,11 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1205,10 +1205,10 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1218,20 +1218,20 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1241,10 +1241,10 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1276,7 +1276,7 @@ func TestAccACMCertificate_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1312,7 +1312,7 @@ func TestAccACMCertificate_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1343,7 +1343,7 @@ func TestAccACMCertificate_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1377,7 +1377,7 @@ func TestAccACMCertificate_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1404,7 +1404,7 @@ func TestAccACMCertificate_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1437,7 +1437,7 @@ func TestAccACMCertificate_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1473,7 +1473,7 @@ func TestAccACMCertificate_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1508,7 +1508,7 @@ func TestAccACMCertificate_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1544,7 +1544,7 @@ func TestAccACMCertificate_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1573,7 +1573,7 @@ func TestAccACMCertificate_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1607,7 +1607,7 @@ func TestAccACMCertificate_tags_DefaultTags_nullOverlappingResourceTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1639,7 +1639,7 @@ func TestAccACMCertificate_tags_DefaultTags_nullOverlappingResourceTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1673,10 +1673,10 @@ func TestAccACMCertificate_tags_DefaultTags_nullNonOverlappingResourceTag(t *tes ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1687,7 +1687,7 @@ func TestAccACMCertificate_tags_DefaultTags_nullNonOverlappingResourceTag(t *tes 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1695,7 +1695,7 @@ func TestAccACMCertificate_tags_DefaultTags_nullNonOverlappingResourceTag(t *tes 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1705,10 +1705,10 @@ func TestAccACMCertificate_tags_DefaultTags_nullNonOverlappingResourceTag(t *tes ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags_defaults/"), ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1800,7 +1800,7 @@ func TestAccACMCertificate_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1897,7 +1897,7 @@ func TestAccACMCertificate_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), diff --git a/internal/service/acm/certificate_test.go b/internal/service/acm/certificate_test.go index df38e45f327c..44bcfe8156d3 100644 --- a/internal/service/acm/certificate_test.go +++ b/internal/service/acm/certificate_test.go @@ -1651,7 +1651,7 @@ func TestAccACMCertificate_PrivateKey_ReimportWithTags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM1), @@ -1669,7 +1669,7 @@ func TestAccACMCertificate_PrivateKey_ReimportWithTags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM1), @@ -1685,7 +1685,7 @@ func TestAccACMCertificate_PrivateKey_ReimportWithTags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), }), "certificate_pem": config.StringVariable(certificatePEM2), @@ -1703,7 +1703,7 @@ func TestAccACMCertificate_PrivateKey_ReimportWithTags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), }), "certificate_pem": config.StringVariable(certificatePEM2), From 799a5826c18705225392bc935b3a5eead68cd2e2 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:18 -0400 Subject: [PATCH 05/30] acmpca: Use constants for test strings --- .../certificate_authority_tags_gen_test.go | 224 +++++++++--------- 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/internal/service/acmpca/certificate_authority_tags_gen_test.go b/internal/service/acmpca/certificate_authority_tags_gen_test.go index d011523e45b8..a52f8d80dd69 100644 --- a/internal/service/acmpca/certificate_authority_tags_gen_test.go +++ b/internal/service/acmpca/certificate_authority_tags_gen_test.go @@ -32,7 +32,7 @@ func TestAccACMPCACertificateAuthority_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -60,7 +60,7 @@ func TestAccACMPCACertificateAuthority_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -75,7 +75,7 @@ func TestAccACMPCACertificateAuthority_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -107,7 +107,7 @@ func TestAccACMPCACertificateAuthority_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -123,7 +123,7 @@ func TestAccACMPCACertificateAuthority_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -151,7 +151,7 @@ func TestAccACMPCACertificateAuthority_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -166,7 +166,7 @@ func TestAccACMPCACertificateAuthority_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -187,7 +187,7 @@ func TestAccACMPCACertificateAuthority_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -216,7 +216,7 @@ func TestAccACMPCACertificateAuthority_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -239,7 +239,7 @@ func TestAccACMPCACertificateAuthority_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -254,7 +254,7 @@ func TestAccACMPCACertificateAuthority_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -279,7 +279,7 @@ func TestAccACMPCACertificateAuthority_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -300,7 +300,7 @@ func TestAccACMPCACertificateAuthority_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -328,7 +328,7 @@ func TestAccACMPCACertificateAuthority_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -359,7 +359,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -386,7 +386,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -401,7 +401,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -422,7 +422,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -451,7 +451,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnUpdate_Add(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -479,7 +479,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnUpdate_Add(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -509,7 +509,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnUpdate_Add(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -525,7 +525,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnUpdate_Add(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -553,7 +553,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnUpdate_Add(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -584,7 +584,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnUpdate_Replace(t *testing ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -612,7 +612,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnUpdate_Replace(t *testing ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -639,7 +639,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnUpdate_Replace(t *testing ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -673,7 +673,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_providerOnly(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -702,7 +702,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_providerOnly(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -720,7 +720,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_providerOnly(t *testing. acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -753,7 +753,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_providerOnly(t *testing. acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -770,7 +770,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_providerOnly(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -800,7 +800,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_providerOnly(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -814,7 +814,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_providerOnly(t *testing. ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -837,7 +837,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_providerOnly(t *testing. ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -867,10 +867,10 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -878,22 +878,22 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -904,10 +904,10 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -923,10 +923,10 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -935,12 +935,12 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -948,12 +948,12 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -965,10 +965,10 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -984,7 +984,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -1007,7 +1007,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1037,10 +1037,10 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1048,20 +1048,20 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1072,10 +1072,10 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1091,11 +1091,11 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1104,11 +1104,11 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1116,11 +1116,11 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1132,11 +1132,11 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1153,10 +1153,10 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1164,20 +1164,20 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1188,10 +1188,10 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1221,7 +1221,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_updateToProviderOnly(t * ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1256,7 +1256,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_updateToProviderOnly(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -1286,7 +1286,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_updateToProviderOnly(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1318,7 +1318,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_updateToResourceOnly(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -1344,7 +1344,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_updateToResourceOnly(t * ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1376,7 +1376,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_updateToResourceOnly(t * ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1410,7 +1410,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_emptyResourceTag(t *test acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1444,7 +1444,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_emptyResourceTag(t *test acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1478,7 +1478,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_emptyProviderOnlyTag(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &v), @@ -1506,7 +1506,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_emptyProviderOnlyTag(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1538,7 +1538,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nullOverlappingResourceT acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1569,7 +1569,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nullOverlappingResourceT acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1601,10 +1601,10 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nullNonOverlappingResour ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1613,7 +1613,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nullNonOverlappingResour 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1621,7 +1621,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nullNonOverlappingResour 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1632,10 +1632,10 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nullNonOverlappingResour ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1722,7 +1722,7 @@ func TestAccACMPCACertificateAuthority_tags_ComputedTag_OnUpdate_Add(t *testing. ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1815,7 +1815,7 @@ func TestAccACMPCACertificateAuthority_tags_ComputedTag_OnUpdate_Replace(t *test ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, From dfe38d83d182bdc485c815afc7b0d4db1b7d93f3 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:18 -0400 Subject: [PATCH 06/30] apprunner: Use constants for test strings --- internal/service/apprunner/vpc_connector_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/apprunner/vpc_connector_test.go b/internal/service/apprunner/vpc_connector_test.go index 19082ce3b053..ba5f13f84f75 100644 --- a/internal/service/apprunner/vpc_connector_test.go +++ b/internal/service/apprunner/vpc_connector_test.go @@ -132,7 +132,7 @@ func TestAccAppRunnerVPCConnector_defaultTags(t *testing.T) { Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), testAccVPCConnectorConfig_basic(rName), ), Check: resource.ComposeTestCheckFunc( @@ -149,7 +149,7 @@ func TestAccAppRunnerVPCConnector_defaultTags(t *testing.T) { }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags2("providerkey1", acctest.CtProviderValue1, "providerkey2", "providervalue2"), + acctest.ConfigDefaultTags_Tags2(acctest.CtProviderKey1, acctest.CtProviderValue1, "providerkey2", "providervalue2"), testAccVPCConnectorConfig_basic(rName), ), Check: resource.ComposeTestCheckFunc( From be529ef936de5b78335a51e73ca532e92ea3d0ed Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:18 -0400 Subject: [PATCH 07/30] appsync: Use constants for test strings --- internal/service/appsync/appsync_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/appsync/appsync_test.go b/internal/service/appsync/appsync_test.go index ddd206876fed..1a450d16a58a 100644 --- a/internal/service/appsync/appsync_test.go +++ b/internal/service/appsync/appsync_test.go @@ -53,7 +53,7 @@ func TestAccAppSync_serial(t *testing.T) { "OpenIDConnect_clientID": testAccGraphQLAPI_OpenIDConnect_clientID, "OpenIDConnect_iatTTL": testAccGraphQLAPI_OpenIDConnect_iatTTL, "OpenIDConnect_issuer": testAccGraphQLAPI_OpenIDConnect_issuer, - "name": testAccGraphQLAPI_name, + acctest.CtName: testAccGraphQLAPI_name, "UserPool_awsRegion": testAccGraphQLAPI_UserPool_region, "UserPool_defaultAction": testAccGraphQLAPI_UserPool_defaultAction, "LambdaAuthorizerConfig_authorizerUri": testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerURI, From b014f094c822bd1a6a83df617c39e8a650d1a8a3 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:18 -0400 Subject: [PATCH 08/30] batch: Use constants for test strings --- .../compute_environment_tags_gen_test.go | 224 +++++++++--------- .../batch/job_definition_tags_gen_test.go | 224 +++++++++--------- .../service/batch/job_queue_tags_gen_test.go | 224 +++++++++--------- .../batch/scheduling_policy_tags_gen_test.go | 224 +++++++++--------- 4 files changed, 448 insertions(+), 448 deletions(-) diff --git a/internal/service/batch/compute_environment_tags_gen_test.go b/internal/service/batch/compute_environment_tags_gen_test.go index 6c9c72ff8775..42242afcc01f 100644 --- a/internal/service/batch/compute_environment_tags_gen_test.go +++ b/internal/service/batch/compute_environment_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -73,7 +73,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -105,7 +105,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -118,7 +118,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -146,7 +146,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -158,7 +158,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -179,7 +179,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -205,7 +205,7 @@ func TestAccBatchComputeEnvironment_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -228,7 +228,7 @@ func TestAccBatchComputeEnvironment_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccBatchComputeEnvironment_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -265,7 +265,7 @@ func TestAccBatchComputeEnvironment_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -286,7 +286,7 @@ func TestAccBatchComputeEnvironment_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -314,7 +314,7 @@ func TestAccBatchComputeEnvironment_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -342,7 +342,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -369,7 +369,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -381,7 +381,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -402,7 +402,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -428,7 +428,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -456,7 +456,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -486,7 +486,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -499,7 +499,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -527,7 +527,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -555,7 +555,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -583,7 +583,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -610,7 +610,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -641,7 +641,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -670,7 +670,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -685,7 +685,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -718,7 +718,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -732,7 +732,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -762,7 +762,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -773,7 +773,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_providerOnly(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -796,7 +796,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_providerOnly(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -823,10 +823,10 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -834,22 +834,22 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -860,10 +860,10 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -876,10 +876,10 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -888,12 +888,12 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -901,12 +901,12 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -918,10 +918,10 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -934,7 +934,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -957,7 +957,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -984,10 +984,10 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -995,20 +995,20 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1019,10 +1019,10 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1035,11 +1035,11 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1048,11 +1048,11 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1060,11 +1060,11 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1076,11 +1076,11 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1094,10 +1094,10 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1105,20 +1105,20 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1129,10 +1129,10 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1159,7 +1159,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_updateToProviderOnly(t *tes ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1194,7 +1194,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_updateToProviderOnly(t *tes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -1224,7 +1224,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_updateToProviderOnly(t *tes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1253,7 +1253,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_updateToResourceOnly(t *tes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -1279,7 +1279,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_updateToResourceOnly(t *tes ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1311,7 +1311,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_updateToResourceOnly(t *tes ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1342,7 +1342,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_emptyResourceTag(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1376,7 +1376,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_emptyResourceTag(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1407,7 +1407,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_emptyProviderOnlyTag(t *tes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &v), @@ -1435,7 +1435,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_emptyProviderOnlyTag(t *tes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1464,7 +1464,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nullOverlappingResourceTag( acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1495,7 +1495,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nullOverlappingResourceTag( acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1524,10 +1524,10 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nullNonOverlappingResourceT ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1536,7 +1536,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nullNonOverlappingResourceT 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1544,7 +1544,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nullNonOverlappingResourceT 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1555,10 +1555,10 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nullNonOverlappingResourceT ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1639,7 +1639,7 @@ func TestAccBatchComputeEnvironment_tags_ComputedTag_OnUpdate_Add(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1729,7 +1729,7 @@ func TestAccBatchComputeEnvironment_tags_ComputedTag_OnUpdate_Replace(t *testing ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/batch/job_definition_tags_gen_test.go b/internal/service/batch/job_definition_tags_gen_test.go index c64576ff5098..47d7539fc54a 100644 --- a/internal/service/batch/job_definition_tags_gen_test.go +++ b/internal/service/batch/job_definition_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccBatchJobDefinition_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccBatchJobDefinition_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -76,7 +76,7 @@ func TestAccBatchJobDefinition_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -108,7 +108,7 @@ func TestAccBatchJobDefinition_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -124,7 +124,7 @@ func TestAccBatchJobDefinition_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -152,7 +152,7 @@ func TestAccBatchJobDefinition_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -167,7 +167,7 @@ func TestAccBatchJobDefinition_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -188,7 +188,7 @@ func TestAccBatchJobDefinition_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -217,7 +217,7 @@ func TestAccBatchJobDefinition_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccBatchJobDefinition_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -255,7 +255,7 @@ func TestAccBatchJobDefinition_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -280,7 +280,7 @@ func TestAccBatchJobDefinition_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -301,7 +301,7 @@ func TestAccBatchJobDefinition_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -329,7 +329,7 @@ func TestAccBatchJobDefinition_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -360,7 +360,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -387,7 +387,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -402,7 +402,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -423,7 +423,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -452,7 +452,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -480,7 +480,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -510,7 +510,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -526,7 +526,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -554,7 +554,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -585,7 +585,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -613,7 +613,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -640,7 +640,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -674,7 +674,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -703,7 +703,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -721,7 +721,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -754,7 +754,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -771,7 +771,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -801,7 +801,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -815,7 +815,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -838,7 +838,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -868,10 +868,10 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -879,22 +879,22 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -905,10 +905,10 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -924,10 +924,10 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -936,12 +936,12 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -949,12 +949,12 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -966,10 +966,10 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -985,7 +985,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -1008,7 +1008,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1038,10 +1038,10 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1049,20 +1049,20 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1073,10 +1073,10 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1092,11 +1092,11 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1105,11 +1105,11 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1117,11 +1117,11 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1133,11 +1133,11 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1154,10 +1154,10 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1165,20 +1165,20 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1189,10 +1189,10 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1222,7 +1222,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_updateToProviderOnly(t *testing. ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1257,7 +1257,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_updateToProviderOnly(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -1287,7 +1287,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_updateToProviderOnly(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1319,7 +1319,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_updateToResourceOnly(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -1345,7 +1345,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_updateToResourceOnly(t *testing. ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1377,7 +1377,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_updateToResourceOnly(t *testing. ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1411,7 +1411,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1445,7 +1445,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1479,7 +1479,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_emptyProviderOnlyTag(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &v), @@ -1507,7 +1507,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_emptyProviderOnlyTag(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1539,7 +1539,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nullOverlappingResourceTag(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1570,7 +1570,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nullOverlappingResourceTag(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1602,10 +1602,10 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nullNonOverlappingResourceTag(t ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1614,7 +1614,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nullNonOverlappingResourceTag(t 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1622,7 +1622,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nullNonOverlappingResourceTag(t 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1633,10 +1633,10 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nullNonOverlappingResourceTag(t ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1723,7 +1723,7 @@ func TestAccBatchJobDefinition_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1816,7 +1816,7 @@ func TestAccBatchJobDefinition_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/batch/job_queue_tags_gen_test.go b/internal/service/batch/job_queue_tags_gen_test.go index 6c7de1d52f25..67f613a4494b 100644 --- a/internal/service/batch/job_queue_tags_gen_test.go +++ b/internal/service/batch/job_queue_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccBatchJobQueue_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccBatchJobQueue_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -73,7 +73,7 @@ func TestAccBatchJobQueue_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -105,7 +105,7 @@ func TestAccBatchJobQueue_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -118,7 +118,7 @@ func TestAccBatchJobQueue_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -146,7 +146,7 @@ func TestAccBatchJobQueue_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -158,7 +158,7 @@ func TestAccBatchJobQueue_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -178,7 +178,7 @@ func TestAccBatchJobQueue_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -206,7 +206,7 @@ func TestAccBatchJobQueue_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -228,7 +228,7 @@ func TestAccBatchJobQueue_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccBatchJobQueue_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -265,7 +265,7 @@ func TestAccBatchJobQueue_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -285,7 +285,7 @@ func TestAccBatchJobQueue_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -313,7 +313,7 @@ func TestAccBatchJobQueue_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -341,7 +341,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -369,7 +369,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -381,7 +381,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -401,7 +401,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -427,7 +427,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -455,7 +455,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -487,7 +487,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -500,7 +500,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -528,7 +528,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -556,7 +556,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -584,7 +584,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -612,7 +612,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -643,7 +643,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -672,7 +672,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -687,7 +687,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -719,7 +719,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -733,7 +733,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -762,7 +762,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -773,7 +773,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -795,7 +795,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -822,10 +822,10 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -833,22 +833,22 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -859,10 +859,10 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -875,10 +875,10 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -887,12 +887,12 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -900,12 +900,12 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -917,10 +917,10 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -933,7 +933,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -955,7 +955,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -982,10 +982,10 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -993,20 +993,20 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1017,10 +1017,10 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1033,11 +1033,11 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1046,11 +1046,11 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1058,11 +1058,11 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1074,11 +1074,11 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1092,10 +1092,10 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1103,20 +1103,20 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1127,10 +1127,10 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1157,7 +1157,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1192,7 +1192,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -1221,7 +1221,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1250,7 +1250,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -1276,7 +1276,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1308,7 +1308,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1339,7 +1339,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1374,7 +1374,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1405,7 +1405,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &v), @@ -1434,7 +1434,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1465,7 +1465,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_nullOverlappingResourceTag(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1496,7 +1496,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_nullOverlappingResourceTag(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1527,10 +1527,10 @@ func TestAccBatchJobQueue_tags_DefaultTags_nullNonOverlappingResourceTag(t *test ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1539,7 +1539,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_nullNonOverlappingResourceTag(t *test 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1547,7 +1547,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_nullNonOverlappingResourceTag(t *test 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1558,10 +1558,10 @@ func TestAccBatchJobQueue_tags_DefaultTags_nullNonOverlappingResourceTag(t *test ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1642,7 +1642,7 @@ func TestAccBatchJobQueue_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1732,7 +1732,7 @@ func TestAccBatchJobQueue_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/batch/scheduling_policy_tags_gen_test.go b/internal/service/batch/scheduling_policy_tags_gen_test.go index d852594534a2..04fb7ff263a8 100644 --- a/internal/service/batch/scheduling_policy_tags_gen_test.go +++ b/internal/service/batch/scheduling_policy_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccBatchSchedulingPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccBatchSchedulingPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -73,7 +73,7 @@ func TestAccBatchSchedulingPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -105,7 +105,7 @@ func TestAccBatchSchedulingPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -118,7 +118,7 @@ func TestAccBatchSchedulingPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -146,7 +146,7 @@ func TestAccBatchSchedulingPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -158,7 +158,7 @@ func TestAccBatchSchedulingPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -179,7 +179,7 @@ func TestAccBatchSchedulingPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -205,7 +205,7 @@ func TestAccBatchSchedulingPolicy_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -228,7 +228,7 @@ func TestAccBatchSchedulingPolicy_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccBatchSchedulingPolicy_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -265,7 +265,7 @@ func TestAccBatchSchedulingPolicy_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -286,7 +286,7 @@ func TestAccBatchSchedulingPolicy_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -314,7 +314,7 @@ func TestAccBatchSchedulingPolicy_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -342,7 +342,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -369,7 +369,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -381,7 +381,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -402,7 +402,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -428,7 +428,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -456,7 +456,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -486,7 +486,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -499,7 +499,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -527,7 +527,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -555,7 +555,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -583,7 +583,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -610,7 +610,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -641,7 +641,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -670,7 +670,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -685,7 +685,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -718,7 +718,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -732,7 +732,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -762,7 +762,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -773,7 +773,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -796,7 +796,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -823,10 +823,10 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -834,22 +834,22 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -860,10 +860,10 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -876,10 +876,10 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -888,12 +888,12 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -901,12 +901,12 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -918,10 +918,10 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -934,7 +934,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -957,7 +957,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -984,10 +984,10 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -995,20 +995,20 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1019,10 +1019,10 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1035,11 +1035,11 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1048,11 +1048,11 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1060,11 +1060,11 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1076,11 +1076,11 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1094,10 +1094,10 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1105,20 +1105,20 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1129,10 +1129,10 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1159,7 +1159,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_updateToProviderOnly(t *testi ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1194,7 +1194,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_updateToProviderOnly(t *testi acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -1224,7 +1224,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_updateToProviderOnly(t *testi acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1253,7 +1253,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_updateToResourceOnly(t *testi acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -1279,7 +1279,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_updateToResourceOnly(t *testi ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1311,7 +1311,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_updateToResourceOnly(t *testi ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1342,7 +1342,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_emptyResourceTag(t *testing.T acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1376,7 +1376,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_emptyResourceTag(t *testing.T acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1407,7 +1407,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_emptyProviderOnlyTag(t *testi acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSchedulingPolicyExists(ctx, resourceName, &v), @@ -1435,7 +1435,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_emptyProviderOnlyTag(t *testi acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1464,7 +1464,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nullOverlappingResourceTag(t acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1495,7 +1495,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nullOverlappingResourceTag(t acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1524,10 +1524,10 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nullNonOverlappingResourceTag ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1536,7 +1536,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nullNonOverlappingResourceTag 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1544,7 +1544,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nullNonOverlappingResourceTag 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1555,10 +1555,10 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nullNonOverlappingResourceTag ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1639,7 +1639,7 @@ func TestAccBatchSchedulingPolicy_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1729,7 +1729,7 @@ func TestAccBatchSchedulingPolicy_tags_ComputedTag_OnUpdate_Replace(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, From b6e4a45be95fa0d6a54973930b6d75560a30e5fa Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:19 -0400 Subject: [PATCH 09/30] comprehend: Use constants for test strings --- internal/service/comprehend/document_classifier_test.go | 6 +++--- internal/service/comprehend/entity_recognizer_test.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/comprehend/document_classifier_test.go b/internal/service/comprehend/document_classifier_test.go index a12384361b7a..6b05b9b0c49f 100644 --- a/internal/service/comprehend/document_classifier_test.go +++ b/internal/service/comprehend/document_classifier_test.go @@ -1328,7 +1328,7 @@ func TestAccComprehendDocumentClassifier_DefaultTags_providerOnly(t *testing.T) Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), testAccDocumentClassifierConfig_tags0(rName), ), Check: resource.ComposeAggregateTestCheckFunc( @@ -1346,7 +1346,7 @@ func TestAccComprehendDocumentClassifier_DefaultTags_providerOnly(t *testing.T) }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags2("providerkey1", acctest.CtProviderValue1, "providerkey2", "providervalue2"), + acctest.ConfigDefaultTags_Tags2(acctest.CtProviderKey1, acctest.CtProviderValue1, "providerkey2", "providervalue2"), testAccDocumentClassifierConfig_tags0(rName), ), Check: resource.ComposeAggregateTestCheckFunc( @@ -1361,7 +1361,7 @@ func TestAccComprehendDocumentClassifier_DefaultTags_providerOnly(t *testing.T) }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtValue1), testAccDocumentClassifierConfig_tags0(rName), ), Check: resource.ComposeAggregateTestCheckFunc( diff --git a/internal/service/comprehend/entity_recognizer_test.go b/internal/service/comprehend/entity_recognizer_test.go index e9fc7ccdae8c..e856d9e59f38 100644 --- a/internal/service/comprehend/entity_recognizer_test.go +++ b/internal/service/comprehend/entity_recognizer_test.go @@ -866,7 +866,7 @@ func TestAccComprehendEntityRecognizer_DefaultTags_providerOnly(t *testing.T) { Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), testAccEntityRecognizerConfig_tags0(rName), ), Check: resource.ComposeAggregateTestCheckFunc( @@ -884,7 +884,7 @@ func TestAccComprehendEntityRecognizer_DefaultTags_providerOnly(t *testing.T) { }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags2("providerkey1", acctest.CtProviderValue1, "providerkey2", "providervalue2"), + acctest.ConfigDefaultTags_Tags2(acctest.CtProviderKey1, acctest.CtProviderValue1, "providerkey2", "providervalue2"), testAccEntityRecognizerConfig_tags0(rName), ), Check: resource.ComposeAggregateTestCheckFunc( @@ -899,7 +899,7 @@ func TestAccComprehendEntityRecognizer_DefaultTags_providerOnly(t *testing.T) { }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtValue1), testAccEntityRecognizerConfig_tags0(rName), ), Check: resource.ComposeAggregateTestCheckFunc( From ed1d36708d0db1108740137d005c816877a391be Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:19 -0400 Subject: [PATCH 10/30] ec2: Use constants for test strings --- .../vpc_security_group_ingress_rule_test.go | 26 +++++++++---------- internal/service/ec2/vpc_subnet_test.go | 26 +++++++++---------- internal/service/ec2/vpc_test.go | 26 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/internal/service/ec2/vpc_security_group_ingress_rule_test.go b/internal/service/ec2/vpc_security_group_ingress_rule_test.go index 621e339672e3..ed463578c7ff 100644 --- a/internal/service/ec2/vpc_security_group_ingress_rule_test.go +++ b/internal/service/ec2/vpc_security_group_ingress_rule_test.go @@ -209,7 +209,7 @@ func TestAccVPCSecurityGroupIngressRule_DefaultTags_providerOnly(t *testing.T) { Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), testAccVPCSecurityGroupIngressRuleConfig_basic(rName), ), Check: resource.ComposeTestCheckFunc( @@ -226,7 +226,7 @@ func TestAccVPCSecurityGroupIngressRule_DefaultTags_providerOnly(t *testing.T) { }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags2("providerkey1", acctest.CtProviderValue1, "providerkey2", "providervalue2"), + acctest.ConfigDefaultTags_Tags2(acctest.CtProviderKey1, acctest.CtProviderValue1, "providerkey2", "providervalue2"), testAccVPCSecurityGroupIngressRuleConfig_basic(rName), ), Check: resource.ComposeTestCheckFunc( @@ -239,7 +239,7 @@ func TestAccVPCSecurityGroupIngressRule_DefaultTags_providerOnly(t *testing.T) { }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtValue1), testAccVPCSecurityGroupIngressRuleConfig_basic(rName), ), Check: resource.ComposeTestCheckFunc( @@ -353,8 +353,8 @@ func TestAccVPCSecurityGroupIngressRule_DefaultTagsProviderAndResource_nonOverla Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), - testAccVPCSecurityGroupIngressRuleConfig_tags1(rName, "resourcekey1", acctest.CtResourceValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), + testAccVPCSecurityGroupIngressRuleConfig_tags1(rName, acctest.CtResourceKey1, acctest.CtResourceValue1), ), Check: resource.ComposeTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v), @@ -372,8 +372,8 @@ func TestAccVPCSecurityGroupIngressRule_DefaultTagsProviderAndResource_nonOverla }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), - testAccVPCSecurityGroupIngressRuleConfig_tags2(rName, "resourcekey1", acctest.CtResourceValue1, "resourcekey2", acctest.CtResourceValue2), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), + testAccVPCSecurityGroupIngressRuleConfig_tags2(rName, acctest.CtResourceKey1, acctest.CtResourceValue1, "resourcekey2", acctest.CtResourceValue2), ), Check: resource.ComposeTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v), @@ -418,8 +418,8 @@ func TestAccVPCSecurityGroupIngressRule_DefaultTagsProviderAndResource_overlappi Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("overlapkey1", acctest.CtProviderValue1), - testAccVPCSecurityGroupIngressRuleConfig_tags1(rName, "overlapkey1", acctest.CtResourceValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtOverlapKey1, acctest.CtProviderValue1), + testAccVPCSecurityGroupIngressRuleConfig_tags1(rName, acctest.CtOverlapKey1, acctest.CtResourceValue1), ), Check: resource.ComposeTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v), @@ -435,8 +435,8 @@ func TestAccVPCSecurityGroupIngressRule_DefaultTagsProviderAndResource_overlappi }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags2("overlapkey1", acctest.CtProviderValue1, "overlapkey2", "providervalue2"), - testAccVPCSecurityGroupIngressRuleConfig_tags2(rName, "overlapkey1", acctest.CtResourceValue1, "overlapkey2", acctest.CtResourceValue2), + acctest.ConfigDefaultTags_Tags2(acctest.CtOverlapKey1, acctest.CtProviderValue1, "overlapkey2", "providervalue2"), + testAccVPCSecurityGroupIngressRuleConfig_tags2(rName, acctest.CtOverlapKey1, acctest.CtResourceValue1, "overlapkey2", acctest.CtResourceValue2), ), Check: resource.ComposeTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v), @@ -450,8 +450,8 @@ func TestAccVPCSecurityGroupIngressRule_DefaultTagsProviderAndResource_overlappi }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("overlapkey1", acctest.CtProviderValue1), - testAccVPCSecurityGroupIngressRuleConfig_tags1(rName, "overlapkey1", acctest.CtResourceValue2), + acctest.ConfigDefaultTags_Tags1(acctest.CtOverlapKey1, acctest.CtProviderValue1), + testAccVPCSecurityGroupIngressRuleConfig_tags1(rName, acctest.CtOverlapKey1, acctest.CtResourceValue2), ), Check: resource.ComposeTestCheckFunc( testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v), diff --git a/internal/service/ec2/vpc_subnet_test.go b/internal/service/ec2/vpc_subnet_test.go index 486f2beabad5..c2503f63db28 100644 --- a/internal/service/ec2/vpc_subnet_test.go +++ b/internal/service/ec2/vpc_subnet_test.go @@ -123,7 +123,7 @@ func TestAccVPCSubnet_DefaultTags_providerOnly(t *testing.T) { Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), testAccVPCSubnetConfig_basic(rName), ), Check: resource.ComposeTestCheckFunc( @@ -140,7 +140,7 @@ func TestAccVPCSubnet_DefaultTags_providerOnly(t *testing.T) { }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags2("providerkey1", acctest.CtProviderValue1, "providerkey2", "providervalue2"), + acctest.ConfigDefaultTags_Tags2(acctest.CtProviderKey1, acctest.CtProviderValue1, "providerkey2", "providervalue2"), testAccVPCSubnetConfig_basic(rName), ), Check: resource.ComposeTestCheckFunc( @@ -153,7 +153,7 @@ func TestAccVPCSubnet_DefaultTags_providerOnly(t *testing.T) { }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtValue1), testAccVPCSubnetConfig_basic(rName), ), Check: resource.ComposeTestCheckFunc( @@ -267,8 +267,8 @@ func TestAccVPCSubnet_DefaultTagsProviderAndResource_nonOverlappingTag(t *testin Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), - testAccVPCSubnetConfig_tags1(rName, "resourcekey1", acctest.CtResourceValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), + testAccVPCSubnetConfig_tags1(rName, acctest.CtResourceKey1, acctest.CtResourceValue1), ), Check: resource.ComposeTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &subnet), @@ -286,8 +286,8 @@ func TestAccVPCSubnet_DefaultTagsProviderAndResource_nonOverlappingTag(t *testin }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), - testAccVPCSubnetConfig_tags2(rName, "resourcekey1", acctest.CtResourceValue1, "resourcekey2", acctest.CtResourceValue2), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), + testAccVPCSubnetConfig_tags2(rName, acctest.CtResourceKey1, acctest.CtResourceValue1, "resourcekey2", acctest.CtResourceValue2), ), Check: resource.ComposeTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &subnet), @@ -332,8 +332,8 @@ func TestAccVPCSubnet_DefaultTagsProviderAndResource_overlappingTag(t *testing.T Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("overlapkey1", acctest.CtProviderValue1), - testAccVPCSubnetConfig_tags1(rName, "overlapkey1", acctest.CtResourceValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtOverlapKey1, acctest.CtProviderValue1), + testAccVPCSubnetConfig_tags1(rName, acctest.CtOverlapKey1, acctest.CtResourceValue1), ), Check: resource.ComposeTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &subnet), @@ -349,8 +349,8 @@ func TestAccVPCSubnet_DefaultTagsProviderAndResource_overlappingTag(t *testing.T }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags2("overlapkey1", acctest.CtProviderValue1, "overlapkey2", "providervalue2"), - testAccVPCSubnetConfig_tags2(rName, "overlapkey1", acctest.CtResourceValue1, "overlapkey2", acctest.CtResourceValue2), + acctest.ConfigDefaultTags_Tags2(acctest.CtOverlapKey1, acctest.CtProviderValue1, "overlapkey2", "providervalue2"), + testAccVPCSubnetConfig_tags2(rName, acctest.CtOverlapKey1, acctest.CtResourceValue1, "overlapkey2", acctest.CtResourceValue2), ), Check: resource.ComposeTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &subnet), @@ -364,8 +364,8 @@ func TestAccVPCSubnet_DefaultTagsProviderAndResource_overlappingTag(t *testing.T }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("overlapkey1", acctest.CtProviderValue1), - testAccVPCSubnetConfig_tags1(rName, "overlapkey1", acctest.CtResourceValue2), + acctest.ConfigDefaultTags_Tags1(acctest.CtOverlapKey1, acctest.CtProviderValue1), + testAccVPCSubnetConfig_tags1(rName, acctest.CtOverlapKey1, acctest.CtResourceValue2), ), Check: resource.ComposeTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &subnet), diff --git a/internal/service/ec2/vpc_test.go b/internal/service/ec2/vpc_test.go index dafc8933dbf9..78b3b49743d2 100644 --- a/internal/service/ec2/vpc_test.go +++ b/internal/service/ec2/vpc_test.go @@ -250,7 +250,7 @@ func TestAccVPC_DefaultTags_providerOnlyTestAccVPC_DefaultTags_providerOnly(t *t Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), testAccVPCConfig_basic, ), Check: resource.ComposeTestCheckFunc( @@ -267,7 +267,7 @@ func TestAccVPC_DefaultTags_providerOnlyTestAccVPC_DefaultTags_providerOnly(t *t }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags2("providerkey1", acctest.CtProviderValue1, "providerkey2", "providervalue2"), + acctest.ConfigDefaultTags_Tags2(acctest.CtProviderKey1, acctest.CtProviderValue1, "providerkey2", "providervalue2"), testAccVPCConfig_basic, ), Check: resource.ComposeTestCheckFunc( @@ -280,7 +280,7 @@ func TestAccVPC_DefaultTags_providerOnlyTestAccVPC_DefaultTags_providerOnly(t *t }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtValue1), testAccVPCConfig_basic, ), Check: resource.ComposeTestCheckFunc( @@ -391,8 +391,8 @@ func TestAccVPC_DefaultTagsProviderAndResource_nonOverlappingTag(t *testing.T) { Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), - testAccVPCConfig_tags1("resourcekey1", acctest.CtResourceValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), + testAccVPCConfig_tags1(acctest.CtResourceKey1, acctest.CtResourceValue1), ), Check: resource.ComposeTestCheckFunc( acctest.CheckVPCExistsV2(ctx, resourceName, &vpc), @@ -410,8 +410,8 @@ func TestAccVPC_DefaultTagsProviderAndResource_nonOverlappingTag(t *testing.T) { }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), - testAccVPCConfig_tags2("resourcekey1", acctest.CtResourceValue1, "resourcekey2", acctest.CtResourceValue2), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), + testAccVPCConfig_tags2(acctest.CtResourceKey1, acctest.CtResourceValue1, "resourcekey2", acctest.CtResourceValue2), ), Check: resource.ComposeTestCheckFunc( acctest.CheckVPCExistsV2(ctx, resourceName, &vpc), @@ -455,8 +455,8 @@ func TestAccVPC_DefaultTagsProviderAndResource_overlappingTag(t *testing.T) { Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("overlapkey1", acctest.CtProviderValue1), - testAccVPCConfig_tags1("overlapkey1", acctest.CtResourceValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtOverlapKey1, acctest.CtProviderValue1), + testAccVPCConfig_tags1(acctest.CtOverlapKey1, acctest.CtResourceValue1), ), Check: resource.ComposeTestCheckFunc( acctest.CheckVPCExistsV2(ctx, resourceName, &vpc), @@ -472,8 +472,8 @@ func TestAccVPC_DefaultTagsProviderAndResource_overlappingTag(t *testing.T) { }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags2("overlapkey1", acctest.CtProviderValue1, "overlapkey2", "providervalue2"), - testAccVPCConfig_tags2("overlapkey1", acctest.CtResourceValue1, "overlapkey2", acctest.CtResourceValue2), + acctest.ConfigDefaultTags_Tags2(acctest.CtOverlapKey1, acctest.CtProviderValue1, "overlapkey2", "providervalue2"), + testAccVPCConfig_tags2(acctest.CtOverlapKey1, acctest.CtResourceValue1, "overlapkey2", acctest.CtResourceValue2), ), Check: resource.ComposeTestCheckFunc( acctest.CheckVPCExistsV2(ctx, resourceName, &vpc), @@ -487,8 +487,8 @@ func TestAccVPC_DefaultTagsProviderAndResource_overlappingTag(t *testing.T) { }, { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("overlapkey1", acctest.CtProviderValue1), - testAccVPCConfig_tags1("overlapkey1", acctest.CtResourceValue2), + acctest.ConfigDefaultTags_Tags1(acctest.CtOverlapKey1, acctest.CtProviderValue1), + testAccVPCConfig_tags1(acctest.CtOverlapKey1, acctest.CtResourceValue2), ), Check: resource.ComposeTestCheckFunc( acctest.CheckVPCExistsV2(ctx, resourceName, &vpc), From ab2fc03a8223a941f889380c23782eaa19a7b748 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:19 -0400 Subject: [PATCH 11/30] iam: Use constants for test strings --- .../iam/instance_profile_tags_gen_test.go | 224 +++++++++--------- .../openid_connect_provider_tags_gen_test.go | 224 +++++++++--------- internal/service/iam/policy_tags_gen_test.go | 224 +++++++++--------- internal/service/iam/role_tags_gen_test.go | 224 +++++++++--------- .../iam/server_certificate_tags_gen_test.go | 224 +++++++++--------- .../iam/service_linked_role_tags_gen_test.go | 224 +++++++++--------- internal/service/iam/user_tags_gen_test.go | 224 +++++++++--------- .../iam/virtual_mfa_device_tags_gen_test.go | 224 +++++++++--------- 8 files changed, 896 insertions(+), 896 deletions(-) diff --git a/internal/service/iam/instance_profile_tags_gen_test.go b/internal/service/iam/instance_profile_tags_gen_test.go index 383c35179568..f202dca03bb3 100644 --- a/internal/service/iam/instance_profile_tags_gen_test.go +++ b/internal/service/iam/instance_profile_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccIAMInstanceProfile_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccIAMInstanceProfile_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -73,7 +73,7 @@ func TestAccIAMInstanceProfile_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -105,7 +105,7 @@ func TestAccIAMInstanceProfile_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -118,7 +118,7 @@ func TestAccIAMInstanceProfile_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -146,7 +146,7 @@ func TestAccIAMInstanceProfile_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -158,7 +158,7 @@ func TestAccIAMInstanceProfile_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -179,7 +179,7 @@ func TestAccIAMInstanceProfile_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -205,7 +205,7 @@ func TestAccIAMInstanceProfile_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -228,7 +228,7 @@ func TestAccIAMInstanceProfile_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccIAMInstanceProfile_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -265,7 +265,7 @@ func TestAccIAMInstanceProfile_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -286,7 +286,7 @@ func TestAccIAMInstanceProfile_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -314,7 +314,7 @@ func TestAccIAMInstanceProfile_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -342,7 +342,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -369,7 +369,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -381,7 +381,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -402,7 +402,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -428,7 +428,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -456,7 +456,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -486,7 +486,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -499,7 +499,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -527,7 +527,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -555,7 +555,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -583,7 +583,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -610,7 +610,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -641,7 +641,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -670,7 +670,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -685,7 +685,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -718,7 +718,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -732,7 +732,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -762,7 +762,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -773,7 +773,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -796,7 +796,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -823,10 +823,10 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -834,22 +834,22 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -860,10 +860,10 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -876,10 +876,10 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -888,12 +888,12 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -901,12 +901,12 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -918,10 +918,10 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -934,7 +934,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -957,7 +957,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -984,10 +984,10 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -995,20 +995,20 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1019,10 +1019,10 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1035,11 +1035,11 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1048,11 +1048,11 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1060,11 +1060,11 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1076,11 +1076,11 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1094,10 +1094,10 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1105,20 +1105,20 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1129,10 +1129,10 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1159,7 +1159,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_updateToProviderOnly(t *testing. ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1194,7 +1194,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_updateToProviderOnly(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -1224,7 +1224,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_updateToProviderOnly(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1253,7 +1253,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_updateToResourceOnly(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -1279,7 +1279,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_updateToResourceOnly(t *testing. ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1311,7 +1311,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_updateToResourceOnly(t *testing. ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1342,7 +1342,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1376,7 +1376,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1407,7 +1407,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_emptyProviderOnlyTag(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &v), @@ -1435,7 +1435,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_emptyProviderOnlyTag(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1464,7 +1464,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nullOverlappingResourceTag(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1495,7 +1495,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nullOverlappingResourceTag(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1524,10 +1524,10 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nullNonOverlappingResourceTag(t ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1536,7 +1536,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nullNonOverlappingResourceTag(t 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1544,7 +1544,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nullNonOverlappingResourceTag(t 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1555,10 +1555,10 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nullNonOverlappingResourceTag(t ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1639,7 +1639,7 @@ func TestAccIAMInstanceProfile_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1729,7 +1729,7 @@ func TestAccIAMInstanceProfile_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/iam/openid_connect_provider_tags_gen_test.go b/internal/service/iam/openid_connect_provider_tags_gen_test.go index a9b724cac277..6507cef68b47 100644 --- a/internal/service/iam/openid_connect_provider_tags_gen_test.go +++ b/internal/service/iam/openid_connect_provider_tags_gen_test.go @@ -31,7 +31,7 @@ func TestAccIAMOpenIDConnectProvider_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -59,7 +59,7 @@ func TestAccIAMOpenIDConnectProvider_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -71,7 +71,7 @@ func TestAccIAMOpenIDConnectProvider_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -103,7 +103,7 @@ func TestAccIAMOpenIDConnectProvider_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -116,7 +116,7 @@ func TestAccIAMOpenIDConnectProvider_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -144,7 +144,7 @@ func TestAccIAMOpenIDConnectProvider_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -156,7 +156,7 @@ func TestAccIAMOpenIDConnectProvider_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -177,7 +177,7 @@ func TestAccIAMOpenIDConnectProvider_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -202,7 +202,7 @@ func TestAccIAMOpenIDConnectProvider_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -225,7 +225,7 @@ func TestAccIAMOpenIDConnectProvider_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -237,7 +237,7 @@ func TestAccIAMOpenIDConnectProvider_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -261,7 +261,7 @@ func TestAccIAMOpenIDConnectProvider_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -282,7 +282,7 @@ func TestAccIAMOpenIDConnectProvider_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -310,7 +310,7 @@ func TestAccIAMOpenIDConnectProvider_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -337,7 +337,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -364,7 +364,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -376,7 +376,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -397,7 +397,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -422,7 +422,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -450,7 +450,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -480,7 +480,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -493,7 +493,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -521,7 +521,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -548,7 +548,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnUpdate_Replace(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -576,7 +576,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnUpdate_Replace(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -603,7 +603,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnUpdate_Replace(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -633,7 +633,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -662,7 +662,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -677,7 +677,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -710,7 +710,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -724,7 +724,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -754,7 +754,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -765,7 +765,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_providerOnly(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -788,7 +788,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_providerOnly(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -814,10 +814,10 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -825,22 +825,22 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -851,10 +851,10 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -867,10 +867,10 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -879,12 +879,12 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -892,12 +892,12 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -909,10 +909,10 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -925,7 +925,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -948,7 +948,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -974,10 +974,10 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -985,20 +985,20 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1009,10 +1009,10 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1025,11 +1025,11 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1038,11 +1038,11 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1050,11 +1050,11 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1066,11 +1066,11 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1084,10 +1084,10 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1095,20 +1095,20 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1119,10 +1119,10 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1148,7 +1148,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_updateToProviderOnly(t *te ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1183,7 +1183,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_updateToProviderOnly(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -1213,7 +1213,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_updateToProviderOnly(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1241,7 +1241,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_updateToResourceOnly(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -1267,7 +1267,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_updateToResourceOnly(t *te ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1299,7 +1299,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_updateToResourceOnly(t *te ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1329,7 +1329,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_emptyResourceTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1363,7 +1363,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_emptyResourceTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1393,7 +1393,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_emptyProviderOnlyTag(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), @@ -1421,7 +1421,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_emptyProviderOnlyTag(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1449,7 +1449,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nullOverlappingResourceTag acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1480,7 +1480,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nullOverlappingResourceTag acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1508,10 +1508,10 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nullNonOverlappingResource ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1520,7 +1520,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nullNonOverlappingResource 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1528,7 +1528,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nullNonOverlappingResource 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1539,10 +1539,10 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nullNonOverlappingResource ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1621,7 +1621,7 @@ func TestAccIAMOpenIDConnectProvider_tags_ComputedTag_OnUpdate_Add(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1710,7 +1710,7 @@ func TestAccIAMOpenIDConnectProvider_tags_ComputedTag_OnUpdate_Replace(t *testin ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/iam/policy_tags_gen_test.go b/internal/service/iam/policy_tags_gen_test.go index e19a626ffe70..5402708d74c7 100644 --- a/internal/service/iam/policy_tags_gen_test.go +++ b/internal/service/iam/policy_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccIAMPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccIAMPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -73,7 +73,7 @@ func TestAccIAMPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -105,7 +105,7 @@ func TestAccIAMPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -118,7 +118,7 @@ func TestAccIAMPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -146,7 +146,7 @@ func TestAccIAMPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -158,7 +158,7 @@ func TestAccIAMPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -179,7 +179,7 @@ func TestAccIAMPolicy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -205,7 +205,7 @@ func TestAccIAMPolicy_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -228,7 +228,7 @@ func TestAccIAMPolicy_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccIAMPolicy_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -265,7 +265,7 @@ func TestAccIAMPolicy_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -286,7 +286,7 @@ func TestAccIAMPolicy_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -314,7 +314,7 @@ func TestAccIAMPolicy_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -342,7 +342,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -369,7 +369,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -381,7 +381,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -402,7 +402,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -428,7 +428,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -456,7 +456,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -486,7 +486,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -499,7 +499,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -527,7 +527,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -555,7 +555,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -583,7 +583,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -610,7 +610,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -641,7 +641,7 @@ func TestAccIAMPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -670,7 +670,7 @@ func TestAccIAMPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -685,7 +685,7 @@ func TestAccIAMPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -718,7 +718,7 @@ func TestAccIAMPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -732,7 +732,7 @@ func TestAccIAMPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -762,7 +762,7 @@ func TestAccIAMPolicy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -773,7 +773,7 @@ func TestAccIAMPolicy_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -796,7 +796,7 @@ func TestAccIAMPolicy_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -823,10 +823,10 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -834,22 +834,22 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -860,10 +860,10 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -876,10 +876,10 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -888,12 +888,12 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -901,12 +901,12 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -918,10 +918,10 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -934,7 +934,7 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -957,7 +957,7 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -984,10 +984,10 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -995,20 +995,20 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1019,10 +1019,10 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1035,11 +1035,11 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1048,11 +1048,11 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1060,11 +1060,11 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1076,11 +1076,11 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1094,10 +1094,10 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1105,20 +1105,20 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1129,10 +1129,10 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1159,7 +1159,7 @@ func TestAccIAMPolicy_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1194,7 +1194,7 @@ func TestAccIAMPolicy_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -1224,7 +1224,7 @@ func TestAccIAMPolicy_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1253,7 +1253,7 @@ func TestAccIAMPolicy_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -1279,7 +1279,7 @@ func TestAccIAMPolicy_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1311,7 +1311,7 @@ func TestAccIAMPolicy_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1342,7 +1342,7 @@ func TestAccIAMPolicy_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1376,7 +1376,7 @@ func TestAccIAMPolicy_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1407,7 +1407,7 @@ func TestAccIAMPolicy_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), @@ -1435,7 +1435,7 @@ func TestAccIAMPolicy_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1464,7 +1464,7 @@ func TestAccIAMPolicy_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1495,7 +1495,7 @@ func TestAccIAMPolicy_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1524,10 +1524,10 @@ func TestAccIAMPolicy_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing. ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1536,7 +1536,7 @@ func TestAccIAMPolicy_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing. 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1544,7 +1544,7 @@ func TestAccIAMPolicy_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing. 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1555,10 +1555,10 @@ func TestAccIAMPolicy_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing. ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1639,7 +1639,7 @@ func TestAccIAMPolicy_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1729,7 +1729,7 @@ func TestAccIAMPolicy_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/iam/role_tags_gen_test.go b/internal/service/iam/role_tags_gen_test.go index 913ff26dcf1c..2eb1908a3c94 100644 --- a/internal/service/iam/role_tags_gen_test.go +++ b/internal/service/iam/role_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccIAMRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccIAMRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -73,7 +73,7 @@ func TestAccIAMRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -105,7 +105,7 @@ func TestAccIAMRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -118,7 +118,7 @@ func TestAccIAMRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -146,7 +146,7 @@ func TestAccIAMRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -158,7 +158,7 @@ func TestAccIAMRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -179,7 +179,7 @@ func TestAccIAMRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -205,7 +205,7 @@ func TestAccIAMRole_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -228,7 +228,7 @@ func TestAccIAMRole_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccIAMRole_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -265,7 +265,7 @@ func TestAccIAMRole_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -286,7 +286,7 @@ func TestAccIAMRole_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -314,7 +314,7 @@ func TestAccIAMRole_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -342,7 +342,7 @@ func TestAccIAMRole_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -369,7 +369,7 @@ func TestAccIAMRole_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -381,7 +381,7 @@ func TestAccIAMRole_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -402,7 +402,7 @@ func TestAccIAMRole_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -428,7 +428,7 @@ func TestAccIAMRole_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -456,7 +456,7 @@ func TestAccIAMRole_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -486,7 +486,7 @@ func TestAccIAMRole_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -499,7 +499,7 @@ func TestAccIAMRole_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -527,7 +527,7 @@ func TestAccIAMRole_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -555,7 +555,7 @@ func TestAccIAMRole_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -583,7 +583,7 @@ func TestAccIAMRole_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -610,7 +610,7 @@ func TestAccIAMRole_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -641,7 +641,7 @@ func TestAccIAMRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -670,7 +670,7 @@ func TestAccIAMRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -685,7 +685,7 @@ func TestAccIAMRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -718,7 +718,7 @@ func TestAccIAMRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -732,7 +732,7 @@ func TestAccIAMRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -762,7 +762,7 @@ func TestAccIAMRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -773,7 +773,7 @@ func TestAccIAMRole_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -796,7 +796,7 @@ func TestAccIAMRole_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -823,10 +823,10 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -834,22 +834,22 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -860,10 +860,10 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -876,10 +876,10 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -888,12 +888,12 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -901,12 +901,12 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -918,10 +918,10 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -934,7 +934,7 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -957,7 +957,7 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -984,10 +984,10 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -995,20 +995,20 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1019,10 +1019,10 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1035,11 +1035,11 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1048,11 +1048,11 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1060,11 +1060,11 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1076,11 +1076,11 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1094,10 +1094,10 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1105,20 +1105,20 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1129,10 +1129,10 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1159,7 +1159,7 @@ func TestAccIAMRole_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1194,7 +1194,7 @@ func TestAccIAMRole_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -1224,7 +1224,7 @@ func TestAccIAMRole_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1253,7 +1253,7 @@ func TestAccIAMRole_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -1279,7 +1279,7 @@ func TestAccIAMRole_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1311,7 +1311,7 @@ func TestAccIAMRole_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1342,7 +1342,7 @@ func TestAccIAMRole_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1376,7 +1376,7 @@ func TestAccIAMRole_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1407,7 +1407,7 @@ func TestAccIAMRole_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRoleExists(ctx, resourceName, &v), @@ -1435,7 +1435,7 @@ func TestAccIAMRole_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1464,7 +1464,7 @@ func TestAccIAMRole_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1495,7 +1495,7 @@ func TestAccIAMRole_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1524,10 +1524,10 @@ func TestAccIAMRole_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1536,7 +1536,7 @@ func TestAccIAMRole_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1544,7 +1544,7 @@ func TestAccIAMRole_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1555,10 +1555,10 @@ func TestAccIAMRole_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1639,7 +1639,7 @@ func TestAccIAMRole_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1729,7 +1729,7 @@ func TestAccIAMRole_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/iam/server_certificate_tags_gen_test.go b/internal/service/iam/server_certificate_tags_gen_test.go index 64a3b87f656e..7543c3053573 100644 --- a/internal/service/iam/server_certificate_tags_gen_test.go +++ b/internal/service/iam/server_certificate_tags_gen_test.go @@ -35,7 +35,7 @@ func TestAccIAMServerCertificate_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -65,7 +65,7 @@ func TestAccIAMServerCertificate_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -83,7 +83,7 @@ func TestAccIAMServerCertificate_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -117,7 +117,7 @@ func TestAccIAMServerCertificate_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -136,7 +136,7 @@ func TestAccIAMServerCertificate_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -166,7 +166,7 @@ func TestAccIAMServerCertificate_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -184,7 +184,7 @@ func TestAccIAMServerCertificate_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -207,7 +207,7 @@ func TestAccIAMServerCertificate_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -241,7 +241,7 @@ func TestAccIAMServerCertificate_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), @@ -266,7 +266,7 @@ func TestAccIAMServerCertificate_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), @@ -284,7 +284,7 @@ func TestAccIAMServerCertificate_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -313,7 +313,7 @@ func TestAccIAMServerCertificate_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -336,7 +336,7 @@ func TestAccIAMServerCertificate_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -366,7 +366,7 @@ func TestAccIAMServerCertificate_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -402,7 +402,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -431,7 +431,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -449,7 +449,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -472,7 +472,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -506,7 +506,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -536,7 +536,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -568,7 +568,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -587,7 +587,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -617,7 +617,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -653,7 +653,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -683,7 +683,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -712,7 +712,7 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -751,7 +751,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -782,7 +782,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -803,7 +803,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -838,7 +838,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -858,7 +858,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -890,7 +890,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -907,7 +907,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -932,7 +932,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -967,10 +967,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -980,22 +980,22 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1006,10 +1006,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1028,10 +1028,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1042,12 +1042,12 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1055,12 +1055,12 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1072,10 +1072,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1094,7 +1094,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1119,7 +1119,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1154,10 +1154,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1167,20 +1167,20 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1191,10 +1191,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1213,11 +1213,11 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1228,11 +1228,11 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1240,11 +1240,11 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1256,11 +1256,11 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1280,10 +1280,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1293,20 +1293,20 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1317,10 +1317,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1355,7 +1355,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_updateToProviderOnly(t *testin ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1392,7 +1392,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_updateToProviderOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1424,7 +1424,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_updateToProviderOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1461,7 +1461,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_updateToResourceOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1489,7 +1489,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_updateToResourceOnly(t *testin ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1523,7 +1523,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_updateToResourceOnly(t *testin ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1562,7 +1562,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_emptyResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1598,7 +1598,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_emptyResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1637,7 +1637,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_emptyProviderOnlyTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1667,7 +1667,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_emptyProviderOnlyTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), }, @@ -1704,7 +1704,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nullOverlappingResourceTag(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1737,7 +1737,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nullOverlappingResourceTag(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), @@ -1774,10 +1774,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nullNonOverlappingResourceTag( ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1788,7 +1788,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nullNonOverlappingResourceTag( 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1796,7 +1796,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nullNonOverlappingResourceTag( 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1807,10 +1807,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nullNonOverlappingResourceTag( ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1909,7 +1909,7 @@ func TestAccIAMServerCertificate_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), @@ -2011,7 +2011,7 @@ func TestAccIAMServerCertificate_tags_ComputedTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), "certificate_pem": config.StringVariable(certificatePEM), diff --git a/internal/service/iam/service_linked_role_tags_gen_test.go b/internal/service/iam/service_linked_role_tags_gen_test.go index 0a86541ccf3c..1cd53dc30ed4 100644 --- a/internal/service/iam/service_linked_role_tags_gen_test.go +++ b/internal/service/iam/service_linked_role_tags_gen_test.go @@ -31,7 +31,7 @@ func TestAccIAMServiceLinkedRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -59,7 +59,7 @@ func TestAccIAMServiceLinkedRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -71,7 +71,7 @@ func TestAccIAMServiceLinkedRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -103,7 +103,7 @@ func TestAccIAMServiceLinkedRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -116,7 +116,7 @@ func TestAccIAMServiceLinkedRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -144,7 +144,7 @@ func TestAccIAMServiceLinkedRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -156,7 +156,7 @@ func TestAccIAMServiceLinkedRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -177,7 +177,7 @@ func TestAccIAMServiceLinkedRole_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -202,7 +202,7 @@ func TestAccIAMServiceLinkedRole_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -225,7 +225,7 @@ func TestAccIAMServiceLinkedRole_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -237,7 +237,7 @@ func TestAccIAMServiceLinkedRole_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -261,7 +261,7 @@ func TestAccIAMServiceLinkedRole_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -282,7 +282,7 @@ func TestAccIAMServiceLinkedRole_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -310,7 +310,7 @@ func TestAccIAMServiceLinkedRole_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -337,7 +337,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -364,7 +364,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -376,7 +376,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -397,7 +397,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -422,7 +422,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -450,7 +450,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -480,7 +480,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -493,7 +493,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -521,7 +521,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -548,7 +548,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -576,7 +576,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -603,7 +603,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -633,7 +633,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -662,7 +662,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -677,7 +677,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -710,7 +710,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -724,7 +724,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -754,7 +754,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -765,7 +765,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -788,7 +788,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -814,10 +814,10 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -825,22 +825,22 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -851,10 +851,10 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -867,10 +867,10 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -879,12 +879,12 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -892,12 +892,12 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -909,10 +909,10 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -925,7 +925,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -948,7 +948,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -974,10 +974,10 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -985,20 +985,20 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1009,10 +1009,10 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1025,11 +1025,11 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1038,11 +1038,11 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1050,11 +1050,11 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1066,11 +1066,11 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1084,10 +1084,10 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1095,20 +1095,20 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1119,10 +1119,10 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1148,7 +1148,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_updateToProviderOnly(t *testin ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1183,7 +1183,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_updateToProviderOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -1213,7 +1213,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_updateToProviderOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1241,7 +1241,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_updateToResourceOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -1267,7 +1267,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_updateToResourceOnly(t *testin ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1299,7 +1299,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_updateToResourceOnly(t *testin ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1329,7 +1329,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_emptyResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1363,7 +1363,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_emptyResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1393,7 +1393,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_emptyProviderOnlyTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), @@ -1421,7 +1421,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_emptyProviderOnlyTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1449,7 +1449,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nullOverlappingResourceTag(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1480,7 +1480,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nullOverlappingResourceTag(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1508,10 +1508,10 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nullNonOverlappingResourceTag( ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1520,7 +1520,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nullNonOverlappingResourceTag( 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1528,7 +1528,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nullNonOverlappingResourceTag( 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1539,10 +1539,10 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nullNonOverlappingResourceTag( ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1621,7 +1621,7 @@ func TestAccIAMServiceLinkedRole_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1710,7 +1710,7 @@ func TestAccIAMServiceLinkedRole_tags_ComputedTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/iam/user_tags_gen_test.go b/internal/service/iam/user_tags_gen_test.go index 883c30a19e6a..4a811a2c9550 100644 --- a/internal/service/iam/user_tags_gen_test.go +++ b/internal/service/iam/user_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccIAMUser_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccIAMUser_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -76,7 +76,7 @@ func TestAccIAMUser_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -108,7 +108,7 @@ func TestAccIAMUser_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -124,7 +124,7 @@ func TestAccIAMUser_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -152,7 +152,7 @@ func TestAccIAMUser_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -167,7 +167,7 @@ func TestAccIAMUser_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -188,7 +188,7 @@ func TestAccIAMUser_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -217,7 +217,7 @@ func TestAccIAMUser_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccIAMUser_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -255,7 +255,7 @@ func TestAccIAMUser_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -280,7 +280,7 @@ func TestAccIAMUser_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -301,7 +301,7 @@ func TestAccIAMUser_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -329,7 +329,7 @@ func TestAccIAMUser_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -360,7 +360,7 @@ func TestAccIAMUser_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -387,7 +387,7 @@ func TestAccIAMUser_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -402,7 +402,7 @@ func TestAccIAMUser_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -423,7 +423,7 @@ func TestAccIAMUser_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -452,7 +452,7 @@ func TestAccIAMUser_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -480,7 +480,7 @@ func TestAccIAMUser_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -510,7 +510,7 @@ func TestAccIAMUser_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -526,7 +526,7 @@ func TestAccIAMUser_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -554,7 +554,7 @@ func TestAccIAMUser_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -585,7 +585,7 @@ func TestAccIAMUser_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -613,7 +613,7 @@ func TestAccIAMUser_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -640,7 +640,7 @@ func TestAccIAMUser_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -674,7 +674,7 @@ func TestAccIAMUser_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -703,7 +703,7 @@ func TestAccIAMUser_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -721,7 +721,7 @@ func TestAccIAMUser_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -754,7 +754,7 @@ func TestAccIAMUser_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -771,7 +771,7 @@ func TestAccIAMUser_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -801,7 +801,7 @@ func TestAccIAMUser_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -815,7 +815,7 @@ func TestAccIAMUser_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -838,7 +838,7 @@ func TestAccIAMUser_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -868,10 +868,10 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -879,22 +879,22 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -905,10 +905,10 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -924,10 +924,10 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -936,12 +936,12 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -949,12 +949,12 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -966,10 +966,10 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -985,7 +985,7 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -1008,7 +1008,7 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1038,10 +1038,10 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1049,20 +1049,20 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1073,10 +1073,10 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1092,11 +1092,11 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1105,11 +1105,11 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1117,11 +1117,11 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1133,11 +1133,11 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1154,10 +1154,10 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1165,20 +1165,20 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1189,10 +1189,10 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1222,7 +1222,7 @@ func TestAccIAMUser_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1257,7 +1257,7 @@ func TestAccIAMUser_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -1287,7 +1287,7 @@ func TestAccIAMUser_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1319,7 +1319,7 @@ func TestAccIAMUser_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -1345,7 +1345,7 @@ func TestAccIAMUser_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1377,7 +1377,7 @@ func TestAccIAMUser_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1411,7 +1411,7 @@ func TestAccIAMUser_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1445,7 +1445,7 @@ func TestAccIAMUser_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1479,7 +1479,7 @@ func TestAccIAMUser_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &v), @@ -1507,7 +1507,7 @@ func TestAccIAMUser_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1539,7 +1539,7 @@ func TestAccIAMUser_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1570,7 +1570,7 @@ func TestAccIAMUser_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1602,10 +1602,10 @@ func TestAccIAMUser_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1614,7 +1614,7 @@ func TestAccIAMUser_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1622,7 +1622,7 @@ func TestAccIAMUser_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1633,10 +1633,10 @@ func TestAccIAMUser_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1723,7 +1723,7 @@ func TestAccIAMUser_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1816,7 +1816,7 @@ func TestAccIAMUser_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/iam/virtual_mfa_device_tags_gen_test.go b/internal/service/iam/virtual_mfa_device_tags_gen_test.go index 7467bf1eae67..7a13b1b583bf 100644 --- a/internal/service/iam/virtual_mfa_device_tags_gen_test.go +++ b/internal/service/iam/virtual_mfa_device_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccIAMVirtualMFADevice_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccIAMVirtualMFADevice_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -76,7 +76,7 @@ func TestAccIAMVirtualMFADevice_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -108,7 +108,7 @@ func TestAccIAMVirtualMFADevice_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -124,7 +124,7 @@ func TestAccIAMVirtualMFADevice_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -152,7 +152,7 @@ func TestAccIAMVirtualMFADevice_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -167,7 +167,7 @@ func TestAccIAMVirtualMFADevice_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -188,7 +188,7 @@ func TestAccIAMVirtualMFADevice_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -217,7 +217,7 @@ func TestAccIAMVirtualMFADevice_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccIAMVirtualMFADevice_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -255,7 +255,7 @@ func TestAccIAMVirtualMFADevice_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -280,7 +280,7 @@ func TestAccIAMVirtualMFADevice_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -301,7 +301,7 @@ func TestAccIAMVirtualMFADevice_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -329,7 +329,7 @@ func TestAccIAMVirtualMFADevice_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -360,7 +360,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -387,7 +387,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -402,7 +402,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -423,7 +423,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -452,7 +452,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -480,7 +480,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -510,7 +510,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -526,7 +526,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -554,7 +554,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -585,7 +585,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -613,7 +613,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -640,7 +640,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -674,7 +674,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -703,7 +703,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -721,7 +721,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -754,7 +754,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -771,7 +771,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -801,7 +801,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -815,7 +815,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -838,7 +838,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -868,10 +868,10 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -879,22 +879,22 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -905,10 +905,10 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -924,10 +924,10 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -936,12 +936,12 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -949,12 +949,12 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -966,10 +966,10 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -985,7 +985,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -1008,7 +1008,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1038,10 +1038,10 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1049,20 +1049,20 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1073,10 +1073,10 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1092,11 +1092,11 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1105,11 +1105,11 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1117,11 +1117,11 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1133,11 +1133,11 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1154,10 +1154,10 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1165,20 +1165,20 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1189,10 +1189,10 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1222,7 +1222,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_updateToProviderOnly(t *testing ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1257,7 +1257,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_updateToProviderOnly(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -1287,7 +1287,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_updateToProviderOnly(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1319,7 +1319,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_updateToResourceOnly(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -1345,7 +1345,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_updateToResourceOnly(t *testing ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1377,7 +1377,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_updateToResourceOnly(t *testing ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1411,7 +1411,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_emptyResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1445,7 +1445,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_emptyResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1479,7 +1479,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_emptyProviderOnlyTag(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &v), @@ -1507,7 +1507,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_emptyProviderOnlyTag(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1539,7 +1539,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nullOverlappingResourceTag(t *t acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1570,7 +1570,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nullOverlappingResourceTag(t *t acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1602,10 +1602,10 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nullNonOverlappingResourceTag(t ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1614,7 +1614,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nullNonOverlappingResourceTag(t 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1622,7 +1622,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nullNonOverlappingResourceTag(t 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1633,10 +1633,10 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nullNonOverlappingResourceTag(t ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1723,7 +1723,7 @@ func TestAccIAMVirtualMFADevice_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1816,7 +1816,7 @@ func TestAccIAMVirtualMFADevice_tags_ComputedTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, From 2115bf6c78f39e16169d4255162de1887f47c113 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:19 -0400 Subject: [PATCH 12/30] licensemanager: Use constants for test strings --- internal/service/licensemanager/grant_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/licensemanager/grant_test.go b/internal/service/licensemanager/grant_test.go index f942eeae7ca0..ec3af6ef573f 100644 --- a/internal/service/licensemanager/grant_test.go +++ b/internal/service/licensemanager/grant_test.go @@ -39,7 +39,7 @@ func TestAccLicenseManagerGrant_serial(t *testing.T) { "grant": { acctest.CtBasic: testAccGrant_basic, "disappears": testAccGrant_disappears, - "name": testAccGrant_name, + acctest.CtName: testAccGrant_name, }, "grant_accepter": { acctest.CtBasic: testAccGrantAccepter_basic, From c949399b4976e0bcfc229a1526c5ee7637801f53 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:19 -0400 Subject: [PATCH 13/30] lightsail: Use constants for test strings --- internal/service/lightsail/lb_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/lightsail/lb_test.go b/internal/service/lightsail/lb_test.go index 496940907dd2..42354bdd3fbf 100644 --- a/internal/service/lightsail/lb_test.go +++ b/internal/service/lightsail/lb_test.go @@ -34,7 +34,7 @@ func TestAccLightsailLoadBalancer_serial(t *testing.T) { "lb": { acctest.CtBasic: testAccLoadBalancer_basic, "disappears": testAccLoadBalancer_disappears, - "name": testAccLoadBalancer_name, + acctest.CtName: testAccLoadBalancer_name, "health_check_path": testAccLoadBalancer_healthCheckPath, "tags": testAccLoadBalancer_tags, }, From 40e7859029a8e54a328c6bb9a00df9b763c118bf Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:19 -0400 Subject: [PATCH 14/30] s3: Use constants for test strings --- .../service/s3/bucket_object_tags_gen_test.go | 224 +++++++++--------- internal/service/s3/bucket_tags_gen_test.go | 224 +++++++++--------- .../service/s3/object_copy_tags_gen_test.go | 146 ++++++------ internal/service/s3/object_tags_gen_test.go | 224 +++++++++--------- internal/service/s3/object_test.go | 2 +- 5 files changed, 410 insertions(+), 410 deletions(-) diff --git a/internal/service/s3/bucket_object_tags_gen_test.go b/internal/service/s3/bucket_object_tags_gen_test.go index c8cd242789b8..f9d09119c27c 100644 --- a/internal/service/s3/bucket_object_tags_gen_test.go +++ b/internal/service/s3/bucket_object_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccS3BucketObject_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccS3BucketObject_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -77,7 +77,7 @@ func TestAccS3BucketObject_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -109,7 +109,7 @@ func TestAccS3BucketObject_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -126,7 +126,7 @@ func TestAccS3BucketObject_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -154,7 +154,7 @@ func TestAccS3BucketObject_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -170,7 +170,7 @@ func TestAccS3BucketObject_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -191,7 +191,7 @@ func TestAccS3BucketObject_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -221,7 +221,7 @@ func TestAccS3BucketObject_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -244,7 +244,7 @@ func TestAccS3BucketObject_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -260,7 +260,7 @@ func TestAccS3BucketObject_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -285,7 +285,7 @@ func TestAccS3BucketObject_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -306,7 +306,7 @@ func TestAccS3BucketObject_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -334,7 +334,7 @@ func TestAccS3BucketObject_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -366,7 +366,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -393,7 +393,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -409,7 +409,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -430,7 +430,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -460,7 +460,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -488,7 +488,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -518,7 +518,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -535,7 +535,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -563,7 +563,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -595,7 +595,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -623,7 +623,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -650,7 +650,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -685,7 +685,7 @@ func TestAccS3BucketObject_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -714,7 +714,7 @@ func TestAccS3BucketObject_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -733,7 +733,7 @@ func TestAccS3BucketObject_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -766,7 +766,7 @@ func TestAccS3BucketObject_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -784,7 +784,7 @@ func TestAccS3BucketObject_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -814,7 +814,7 @@ func TestAccS3BucketObject_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -829,7 +829,7 @@ func TestAccS3BucketObject_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -852,7 +852,7 @@ func TestAccS3BucketObject_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -883,10 +883,10 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -894,22 +894,22 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -920,10 +920,10 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -940,10 +940,10 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -952,12 +952,12 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -965,12 +965,12 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -982,10 +982,10 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1002,7 +1002,7 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -1025,7 +1025,7 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1056,10 +1056,10 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1067,20 +1067,20 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1091,10 +1091,10 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1111,11 +1111,11 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1124,11 +1124,11 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1136,11 +1136,11 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1152,11 +1152,11 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1174,10 +1174,10 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1185,20 +1185,20 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1209,10 +1209,10 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1243,7 +1243,7 @@ func TestAccS3BucketObject_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1278,7 +1278,7 @@ func TestAccS3BucketObject_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -1308,7 +1308,7 @@ func TestAccS3BucketObject_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1341,7 +1341,7 @@ func TestAccS3BucketObject_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -1367,7 +1367,7 @@ func TestAccS3BucketObject_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1399,7 +1399,7 @@ func TestAccS3BucketObject_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1434,7 +1434,7 @@ func TestAccS3BucketObject_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1468,7 +1468,7 @@ func TestAccS3BucketObject_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1503,7 +1503,7 @@ func TestAccS3BucketObject_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketObjectExists(ctx, resourceName, &v), @@ -1531,7 +1531,7 @@ func TestAccS3BucketObject_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1564,7 +1564,7 @@ func TestAccS3BucketObject_tags_DefaultTags_nullOverlappingResourceTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1595,7 +1595,7 @@ func TestAccS3BucketObject_tags_DefaultTags_nullOverlappingResourceTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1628,10 +1628,10 @@ func TestAccS3BucketObject_tags_DefaultTags_nullNonOverlappingResourceTag(t *tes ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1640,7 +1640,7 @@ func TestAccS3BucketObject_tags_DefaultTags_nullNonOverlappingResourceTag(t *tes 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1648,7 +1648,7 @@ func TestAccS3BucketObject_tags_DefaultTags_nullNonOverlappingResourceTag(t *tes 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1659,10 +1659,10 @@ func TestAccS3BucketObject_tags_DefaultTags_nullNonOverlappingResourceTag(t *tes ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1751,7 +1751,7 @@ func TestAccS3BucketObject_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1845,7 +1845,7 @@ func TestAccS3BucketObject_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/s3/bucket_tags_gen_test.go b/internal/service/s3/bucket_tags_gen_test.go index ce2beb4469b3..5ff04880bb65 100644 --- a/internal/service/s3/bucket_tags_gen_test.go +++ b/internal/service/s3/bucket_tags_gen_test.go @@ -31,7 +31,7 @@ func TestAccS3Bucket_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -59,7 +59,7 @@ func TestAccS3Bucket_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -74,7 +74,7 @@ func TestAccS3Bucket_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -106,7 +106,7 @@ func TestAccS3Bucket_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -122,7 +122,7 @@ func TestAccS3Bucket_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -150,7 +150,7 @@ func TestAccS3Bucket_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -165,7 +165,7 @@ func TestAccS3Bucket_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -186,7 +186,7 @@ func TestAccS3Bucket_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -214,7 +214,7 @@ func TestAccS3Bucket_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -237,7 +237,7 @@ func TestAccS3Bucket_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -252,7 +252,7 @@ func TestAccS3Bucket_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -276,7 +276,7 @@ func TestAccS3Bucket_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -297,7 +297,7 @@ func TestAccS3Bucket_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -325,7 +325,7 @@ func TestAccS3Bucket_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -355,7 +355,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -382,7 +382,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -397,7 +397,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -418,7 +418,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -446,7 +446,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -474,7 +474,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -504,7 +504,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -520,7 +520,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -548,7 +548,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -578,7 +578,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -606,7 +606,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -633,7 +633,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -666,7 +666,7 @@ func TestAccS3Bucket_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -695,7 +695,7 @@ func TestAccS3Bucket_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -713,7 +713,7 @@ func TestAccS3Bucket_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -746,7 +746,7 @@ func TestAccS3Bucket_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -763,7 +763,7 @@ func TestAccS3Bucket_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -793,7 +793,7 @@ func TestAccS3Bucket_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -807,7 +807,7 @@ func TestAccS3Bucket_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -830,7 +830,7 @@ func TestAccS3Bucket_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -859,10 +859,10 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -870,22 +870,22 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -896,10 +896,10 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -915,10 +915,10 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -927,12 +927,12 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -940,12 +940,12 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -957,10 +957,10 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -976,7 +976,7 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -999,7 +999,7 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1028,10 +1028,10 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1039,20 +1039,20 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1063,10 +1063,10 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1082,11 +1082,11 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1095,11 +1095,11 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1107,11 +1107,11 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1123,11 +1123,11 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1144,10 +1144,10 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1155,20 +1155,20 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1179,10 +1179,10 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1211,7 +1211,7 @@ func TestAccS3Bucket_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1246,7 +1246,7 @@ func TestAccS3Bucket_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -1276,7 +1276,7 @@ func TestAccS3Bucket_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1307,7 +1307,7 @@ func TestAccS3Bucket_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -1333,7 +1333,7 @@ func TestAccS3Bucket_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1365,7 +1365,7 @@ func TestAccS3Bucket_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1398,7 +1398,7 @@ func TestAccS3Bucket_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1432,7 +1432,7 @@ func TestAccS3Bucket_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1465,7 +1465,7 @@ func TestAccS3Bucket_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), @@ -1493,7 +1493,7 @@ func TestAccS3Bucket_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1524,7 +1524,7 @@ func TestAccS3Bucket_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1555,7 +1555,7 @@ func TestAccS3Bucket_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1586,10 +1586,10 @@ func TestAccS3Bucket_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1598,7 +1598,7 @@ func TestAccS3Bucket_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1606,7 +1606,7 @@ func TestAccS3Bucket_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1617,10 +1617,10 @@ func TestAccS3Bucket_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1705,7 +1705,7 @@ func TestAccS3Bucket_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1797,7 +1797,7 @@ func TestAccS3Bucket_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/s3/object_copy_tags_gen_test.go b/internal/service/s3/object_copy_tags_gen_test.go index 417d1e607c0e..28ef8a4b9330 100644 --- a/internal/service/s3/object_copy_tags_gen_test.go +++ b/internal/service/s3/object_copy_tags_gen_test.go @@ -31,7 +31,7 @@ func TestAccS3ObjectCopy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -60,7 +60,7 @@ func TestAccS3ObjectCopy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -93,7 +93,7 @@ func TestAccS3ObjectCopy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -122,7 +122,7 @@ func TestAccS3ObjectCopy_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -158,7 +158,7 @@ func TestAccS3ObjectCopy_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -182,7 +182,7 @@ func TestAccS3ObjectCopy_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -206,7 +206,7 @@ func TestAccS3ObjectCopy_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -227,7 +227,7 @@ func TestAccS3ObjectCopy_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -270,7 +270,7 @@ func TestAccS3ObjectCopy_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -298,7 +298,7 @@ func TestAccS3ObjectCopy_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -334,7 +334,7 @@ func TestAccS3ObjectCopy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -362,7 +362,7 @@ func TestAccS3ObjectCopy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -393,7 +393,7 @@ func TestAccS3ObjectCopy_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -436,7 +436,7 @@ func TestAccS3ObjectCopy_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -464,7 +464,7 @@ func TestAccS3ObjectCopy_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -509,7 +509,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -540,7 +540,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -573,7 +573,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -601,7 +601,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -639,10 +639,10 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -650,22 +650,22 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -677,10 +677,10 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -689,12 +689,12 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -702,12 +702,12 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -719,7 +719,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -757,10 +757,10 @@ func TestAccS3ObjectCopy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -768,20 +768,20 @@ func TestAccS3ObjectCopy_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -793,11 +793,11 @@ func TestAccS3ObjectCopy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -806,11 +806,11 @@ func TestAccS3ObjectCopy_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -818,11 +818,11 @@ func TestAccS3ObjectCopy_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -835,10 +835,10 @@ func TestAccS3ObjectCopy_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -846,20 +846,20 @@ func TestAccS3ObjectCopy_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -883,7 +883,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -918,7 +918,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -962,7 +962,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -988,7 +988,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1037,7 +1037,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1085,7 +1085,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectCopyExists(ctx, resourceName), @@ -1127,7 +1127,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nullOverlappingResourceTag(t *testing. acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1170,10 +1170,10 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nullNonOverlappingResourceTag(t *testi ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1182,7 +1182,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nullNonOverlappingResourceTag(t *testi 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1190,7 +1190,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nullNonOverlappingResourceTag(t *testi 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1256,7 +1256,7 @@ func TestAccS3ObjectCopy_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1332,7 +1332,7 @@ func TestAccS3ObjectCopy_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/s3/object_tags_gen_test.go b/internal/service/s3/object_tags_gen_test.go index f8364e27afab..cf31504d3e73 100644 --- a/internal/service/s3/object_tags_gen_test.go +++ b/internal/service/s3/object_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccS3Object_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccS3Object_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -77,7 +77,7 @@ func TestAccS3Object_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -109,7 +109,7 @@ func TestAccS3Object_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -126,7 +126,7 @@ func TestAccS3Object_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -154,7 +154,7 @@ func TestAccS3Object_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -170,7 +170,7 @@ func TestAccS3Object_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -191,7 +191,7 @@ func TestAccS3Object_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -221,7 +221,7 @@ func TestAccS3Object_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -244,7 +244,7 @@ func TestAccS3Object_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -260,7 +260,7 @@ func TestAccS3Object_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -285,7 +285,7 @@ func TestAccS3Object_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -306,7 +306,7 @@ func TestAccS3Object_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -334,7 +334,7 @@ func TestAccS3Object_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -366,7 +366,7 @@ func TestAccS3Object_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -393,7 +393,7 @@ func TestAccS3Object_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -409,7 +409,7 @@ func TestAccS3Object_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -430,7 +430,7 @@ func TestAccS3Object_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -460,7 +460,7 @@ func TestAccS3Object_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -488,7 +488,7 @@ func TestAccS3Object_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -518,7 +518,7 @@ func TestAccS3Object_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -535,7 +535,7 @@ func TestAccS3Object_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -563,7 +563,7 @@ func TestAccS3Object_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -595,7 +595,7 @@ func TestAccS3Object_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -623,7 +623,7 @@ func TestAccS3Object_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -650,7 +650,7 @@ func TestAccS3Object_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -685,7 +685,7 @@ func TestAccS3Object_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -714,7 +714,7 @@ func TestAccS3Object_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -733,7 +733,7 @@ func TestAccS3Object_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -766,7 +766,7 @@ func TestAccS3Object_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -784,7 +784,7 @@ func TestAccS3Object_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -814,7 +814,7 @@ func TestAccS3Object_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -829,7 +829,7 @@ func TestAccS3Object_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -852,7 +852,7 @@ func TestAccS3Object_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -883,10 +883,10 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -894,22 +894,22 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -920,10 +920,10 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -940,10 +940,10 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -952,12 +952,12 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -965,12 +965,12 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -982,10 +982,10 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1002,7 +1002,7 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -1025,7 +1025,7 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1056,10 +1056,10 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1067,20 +1067,20 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1091,10 +1091,10 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1111,11 +1111,11 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1124,11 +1124,11 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1136,11 +1136,11 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1152,11 +1152,11 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1174,10 +1174,10 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1185,20 +1185,20 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1209,10 +1209,10 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1243,7 +1243,7 @@ func TestAccS3Object_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1278,7 +1278,7 @@ func TestAccS3Object_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -1308,7 +1308,7 @@ func TestAccS3Object_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1341,7 +1341,7 @@ func TestAccS3Object_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -1367,7 +1367,7 @@ func TestAccS3Object_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1399,7 +1399,7 @@ func TestAccS3Object_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1434,7 +1434,7 @@ func TestAccS3Object_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1468,7 +1468,7 @@ func TestAccS3Object_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1503,7 +1503,7 @@ func TestAccS3Object_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &v), @@ -1531,7 +1531,7 @@ func TestAccS3Object_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1564,7 +1564,7 @@ func TestAccS3Object_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1595,7 +1595,7 @@ func TestAccS3Object_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1628,10 +1628,10 @@ func TestAccS3Object_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1640,7 +1640,7 @@ func TestAccS3Object_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1648,7 +1648,7 @@ func TestAccS3Object_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1659,10 +1659,10 @@ func TestAccS3Object_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1751,7 +1751,7 @@ func TestAccS3Object_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1845,7 +1845,7 @@ func TestAccS3Object_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/s3/object_test.go b/internal/service/s3/object_test.go index 1ac25203263c..18feaadb1177 100644 --- a/internal/service/s3/object_test.go +++ b/internal/service/s3/object_test.go @@ -1757,7 +1757,7 @@ func TestAccS3Object_DirectoryBucket_DefaultTags_providerOnly(t *testing.T) { Steps: []resource.TestStep{ { Config: acctest.ConfigCompose( - acctest.ConfigDefaultTags_Tags1("providerkey1", acctest.CtProviderValue1), + acctest.ConfigDefaultTags_Tags1(acctest.CtProviderKey1, acctest.CtProviderValue1), testAccObjectConfig_directoryBucket(rName), ), Check: resource.ComposeAggregateTestCheckFunc( From 7afa75afc7bfb575268596b47b93cd17b31a34e7 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:20 -0400 Subject: [PATCH 15/30] servicecatalog: Use constants for test strings --- .../servicecatalog/portfolio_tags_gen_test.go | 224 +++++++++--------- .../servicecatalog/product_tags_gen_test.go | 224 +++++++++--------- .../provisioned_product_tags_gen_test.go | 224 +++++++++--------- 3 files changed, 336 insertions(+), 336 deletions(-) diff --git a/internal/service/servicecatalog/portfolio_tags_gen_test.go b/internal/service/servicecatalog/portfolio_tags_gen_test.go index e4777a08a905..fe38630742c4 100644 --- a/internal/service/servicecatalog/portfolio_tags_gen_test.go +++ b/internal/service/servicecatalog/portfolio_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccServiceCatalogPortfolio_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccServiceCatalogPortfolio_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -73,7 +73,7 @@ func TestAccServiceCatalogPortfolio_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -105,7 +105,7 @@ func TestAccServiceCatalogPortfolio_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -118,7 +118,7 @@ func TestAccServiceCatalogPortfolio_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -146,7 +146,7 @@ func TestAccServiceCatalogPortfolio_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -158,7 +158,7 @@ func TestAccServiceCatalogPortfolio_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -179,7 +179,7 @@ func TestAccServiceCatalogPortfolio_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -205,7 +205,7 @@ func TestAccServiceCatalogPortfolio_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -228,7 +228,7 @@ func TestAccServiceCatalogPortfolio_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccServiceCatalogPortfolio_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -265,7 +265,7 @@ func TestAccServiceCatalogPortfolio_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -286,7 +286,7 @@ func TestAccServiceCatalogPortfolio_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -314,7 +314,7 @@ func TestAccServiceCatalogPortfolio_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -344,7 +344,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -371,7 +371,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -383,7 +383,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -404,7 +404,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -432,7 +432,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -460,7 +460,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -490,7 +490,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -503,7 +503,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -531,7 +531,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -561,7 +561,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -589,7 +589,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -616,7 +616,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -647,7 +647,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -676,7 +676,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -691,7 +691,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -724,7 +724,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -738,7 +738,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -768,7 +768,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_providerOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -779,7 +779,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_providerOnly(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -802,7 +802,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_providerOnly(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -829,10 +829,10 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -840,22 +840,22 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -866,10 +866,10 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -882,10 +882,10 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -894,12 +894,12 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -907,12 +907,12 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -924,10 +924,10 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -940,7 +940,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -963,7 +963,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -990,10 +990,10 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1001,20 +1001,20 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1025,10 +1025,10 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1041,11 +1041,11 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1054,11 +1054,11 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1066,11 +1066,11 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1082,11 +1082,11 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1100,10 +1100,10 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1111,20 +1111,20 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1135,10 +1135,10 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1165,7 +1165,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_updateToProviderOnly(t *tes ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1200,7 +1200,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_updateToProviderOnly(t *tes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -1230,7 +1230,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_updateToProviderOnly(t *tes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1259,7 +1259,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_updateToResourceOnly(t *tes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -1285,7 +1285,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_updateToResourceOnly(t *tes ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1317,7 +1317,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_updateToResourceOnly(t *tes ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1350,7 +1350,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_emptyResourceTag(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1384,7 +1384,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_emptyResourceTag(t *testing acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1417,7 +1417,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_emptyProviderOnlyTag(t *tes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &v), @@ -1445,7 +1445,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_emptyProviderOnlyTag(t *tes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1474,7 +1474,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nullOverlappingResourceTag( acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1505,7 +1505,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nullOverlappingResourceTag( acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1534,10 +1534,10 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nullNonOverlappingResourceT ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1546,7 +1546,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nullNonOverlappingResourceT 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1554,7 +1554,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nullNonOverlappingResourceT 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1565,10 +1565,10 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nullNonOverlappingResourceT ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1649,7 +1649,7 @@ func TestAccServiceCatalogPortfolio_tags_ComputedTag_OnUpdate_Add(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1739,7 +1739,7 @@ func TestAccServiceCatalogPortfolio_tags_ComputedTag_OnUpdate_Replace(t *testing ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/servicecatalog/product_tags_gen_test.go b/internal/service/servicecatalog/product_tags_gen_test.go index 44d149283ed2..fd40e66a22a0 100644 --- a/internal/service/servicecatalog/product_tags_gen_test.go +++ b/internal/service/servicecatalog/product_tags_gen_test.go @@ -31,7 +31,7 @@ func TestAccServiceCatalogProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -59,7 +59,7 @@ func TestAccServiceCatalogProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -74,7 +74,7 @@ func TestAccServiceCatalogProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -106,7 +106,7 @@ func TestAccServiceCatalogProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -122,7 +122,7 @@ func TestAccServiceCatalogProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -150,7 +150,7 @@ func TestAccServiceCatalogProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -165,7 +165,7 @@ func TestAccServiceCatalogProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -186,7 +186,7 @@ func TestAccServiceCatalogProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -214,7 +214,7 @@ func TestAccServiceCatalogProduct_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -237,7 +237,7 @@ func TestAccServiceCatalogProduct_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -252,7 +252,7 @@ func TestAccServiceCatalogProduct_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -276,7 +276,7 @@ func TestAccServiceCatalogProduct_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -297,7 +297,7 @@ func TestAccServiceCatalogProduct_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -325,7 +325,7 @@ func TestAccServiceCatalogProduct_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -357,7 +357,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -384,7 +384,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -399,7 +399,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -420,7 +420,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -450,7 +450,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -478,7 +478,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -508,7 +508,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -524,7 +524,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -552,7 +552,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -584,7 +584,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -612,7 +612,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -639,7 +639,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -672,7 +672,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -701,7 +701,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -719,7 +719,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -752,7 +752,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -769,7 +769,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -799,7 +799,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -813,7 +813,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -836,7 +836,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -865,10 +865,10 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -876,22 +876,22 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -902,10 +902,10 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -921,10 +921,10 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -933,12 +933,12 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -946,12 +946,12 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -963,10 +963,10 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -982,7 +982,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -1005,7 +1005,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1034,10 +1034,10 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1045,20 +1045,20 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1069,10 +1069,10 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1088,11 +1088,11 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1101,11 +1101,11 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1113,11 +1113,11 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1129,11 +1129,11 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1150,10 +1150,10 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1161,20 +1161,20 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1185,10 +1185,10 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1217,7 +1217,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_updateToProviderOnly(t *testi ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1252,7 +1252,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_updateToProviderOnly(t *testi acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -1282,7 +1282,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_updateToProviderOnly(t *testi acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1313,7 +1313,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_updateToResourceOnly(t *testi acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -1339,7 +1339,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_updateToResourceOnly(t *testi ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1371,7 +1371,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_updateToResourceOnly(t *testi ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1406,7 +1406,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_emptyResourceTag(t *testing.T acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1440,7 +1440,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_emptyResourceTag(t *testing.T acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1475,7 +1475,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_emptyProviderOnlyTag(t *testi acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProductExists(ctx, resourceName), @@ -1503,7 +1503,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_emptyProviderOnlyTag(t *testi acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1534,7 +1534,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nullOverlappingResourceTag(t acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1565,7 +1565,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nullOverlappingResourceTag(t acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1596,10 +1596,10 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nullNonOverlappingResourceTag ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1608,7 +1608,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nullNonOverlappingResourceTag 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1616,7 +1616,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nullNonOverlappingResourceTag 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1627,10 +1627,10 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nullNonOverlappingResourceTag ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1715,7 +1715,7 @@ func TestAccServiceCatalogProduct_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1807,7 +1807,7 @@ func TestAccServiceCatalogProduct_tags_ComputedTag_OnUpdate_Replace(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/servicecatalog/provisioned_product_tags_gen_test.go b/internal/service/servicecatalog/provisioned_product_tags_gen_test.go index 9afe39f461fd..3991a8edb1a6 100644 --- a/internal/service/servicecatalog/provisioned_product_tags_gen_test.go +++ b/internal/service/servicecatalog/provisioned_product_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccServiceCatalogProvisionedProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccServiceCatalogProvisionedProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -76,7 +76,7 @@ func TestAccServiceCatalogProvisionedProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -108,7 +108,7 @@ func TestAccServiceCatalogProvisionedProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -124,7 +124,7 @@ func TestAccServiceCatalogProvisionedProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -153,7 +153,7 @@ func TestAccServiceCatalogProvisionedProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -169,7 +169,7 @@ func TestAccServiceCatalogProvisionedProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -191,7 +191,7 @@ func TestAccServiceCatalogProvisionedProduct_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -221,7 +221,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -244,7 +244,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -259,7 +259,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -284,7 +284,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -305,7 +305,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -333,7 +333,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -366,7 +366,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnCreate(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -393,7 +393,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnCreate(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -408,7 +408,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnCreate(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -429,7 +429,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnCreate(t *testing.T ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -460,7 +460,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnUpdate_Add(t *testi ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -488,7 +488,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnUpdate_Add(t *testi ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -518,7 +518,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnUpdate_Add(t *testi ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -534,7 +534,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnUpdate_Add(t *testi ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -562,7 +562,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnUpdate_Add(t *testi ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -595,7 +595,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnUpdate_Replace(t *t ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -623,7 +623,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnUpdate_Replace(t *t ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -650,7 +650,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnUpdate_Replace(t *t ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -684,7 +684,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_providerOnly(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -713,7 +713,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_providerOnly(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -731,7 +731,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_providerOnly(t *te acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -764,7 +764,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_providerOnly(t *te acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -781,7 +781,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_providerOnly(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -812,7 +812,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_providerOnly(t *te acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -827,7 +827,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_providerOnly(t *te ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -851,7 +851,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_providerOnly(t *te ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -882,10 +882,10 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -893,22 +893,22 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -919,10 +919,10 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -938,10 +938,10 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -950,12 +950,12 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -963,12 +963,12 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -980,10 +980,10 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -999,7 +999,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -1023,7 +1023,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1054,10 +1054,10 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1065,20 +1065,20 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1089,10 +1089,10 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1108,11 +1108,11 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1121,11 +1121,11 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1133,11 +1133,11 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1149,11 +1149,11 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1170,10 +1170,10 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1181,20 +1181,20 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1205,10 +1205,10 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1238,7 +1238,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_updateToProviderOn ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1273,7 +1273,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_updateToProviderOn acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -1303,7 +1303,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_updateToProviderOn acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1335,7 +1335,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_updateToResourceOn acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -1361,7 +1361,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_updateToResourceOn ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1393,7 +1393,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_updateToResourceOn ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1429,7 +1429,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_emptyResourceTag(t acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1463,7 +1463,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_emptyResourceTag(t acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1499,7 +1499,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_emptyProviderOnlyT acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), @@ -1527,7 +1527,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_emptyProviderOnlyT acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1559,7 +1559,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nullOverlappingRes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1590,7 +1590,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nullOverlappingRes acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1622,10 +1622,10 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nullNonOverlapping ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1634,7 +1634,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nullNonOverlapping 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1642,7 +1642,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nullNonOverlapping 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1653,10 +1653,10 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nullNonOverlapping ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1743,7 +1743,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_ComputedTag_OnUpdate_Add(t *te ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1836,7 +1836,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_ComputedTag_OnUpdate_Replace(t ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, From 216df777964c7b3d70ac68db0cdcc1e0a2dc3590 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:20 -0400 Subject: [PATCH 16/30] ssmcontacts: Use constants for test strings --- internal/service/ssmcontacts/ssmcontacts_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ssmcontacts/ssmcontacts_test.go b/internal/service/ssmcontacts/ssmcontacts_test.go index 0bfb57f45afc..c4e3573a7f79 100644 --- a/internal/service/ssmcontacts/ssmcontacts_test.go +++ b/internal/service/ssmcontacts/ssmcontacts_test.go @@ -31,7 +31,7 @@ func TestAccSSMContacts_serial(t *testing.T) { "contactId": testAccContactChannel_contactID, "deliveryAddress": testAccContactChannel_deliveryAddress, "disappears": testAccContactChannel_disappears, - "name": testAccContactChannel_name, + acctest.CtName: testAccContactChannel_name, "type": testAccContactChannel_type, }, "Contact Channel Data Source Tests": { From d48785f52f25d5c164794a2c762e0e9c1cc445ec Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 23 May 2024 21:52:20 -0400 Subject: [PATCH 17/30] xray: Use constants for test strings --- internal/service/xray/group_tags_gen_test.go | 224 +++++++++--------- .../xray/sampling_rule_tags_gen_test.go | 224 +++++++++--------- 2 files changed, 224 insertions(+), 224 deletions(-) diff --git a/internal/service/xray/group_tags_gen_test.go b/internal/service/xray/group_tags_gen_test.go index 611e41622ada..a0d3f4d3fdb7 100644 --- a/internal/service/xray/group_tags_gen_test.go +++ b/internal/service/xray/group_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccXRayGroup_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccXRayGroup_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -73,7 +73,7 @@ func TestAccXRayGroup_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -105,7 +105,7 @@ func TestAccXRayGroup_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -118,7 +118,7 @@ func TestAccXRayGroup_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -146,7 +146,7 @@ func TestAccXRayGroup_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -158,7 +158,7 @@ func TestAccXRayGroup_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -179,7 +179,7 @@ func TestAccXRayGroup_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -205,7 +205,7 @@ func TestAccXRayGroup_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -228,7 +228,7 @@ func TestAccXRayGroup_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccXRayGroup_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -265,7 +265,7 @@ func TestAccXRayGroup_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -286,7 +286,7 @@ func TestAccXRayGroup_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -314,7 +314,7 @@ func TestAccXRayGroup_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -342,7 +342,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -369,7 +369,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -381,7 +381,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -402,7 +402,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -428,7 +428,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -456,7 +456,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -486,7 +486,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -499,7 +499,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -527,7 +527,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -555,7 +555,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -583,7 +583,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -610,7 +610,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -641,7 +641,7 @@ func TestAccXRayGroup_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -670,7 +670,7 @@ func TestAccXRayGroup_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -685,7 +685,7 @@ func TestAccXRayGroup_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -718,7 +718,7 @@ func TestAccXRayGroup_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -732,7 +732,7 @@ func TestAccXRayGroup_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -762,7 +762,7 @@ func TestAccXRayGroup_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -773,7 +773,7 @@ func TestAccXRayGroup_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -796,7 +796,7 @@ func TestAccXRayGroup_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -823,10 +823,10 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -834,22 +834,22 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -860,10 +860,10 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -876,10 +876,10 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -888,12 +888,12 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -901,12 +901,12 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -918,10 +918,10 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -934,7 +934,7 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -957,7 +957,7 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -984,10 +984,10 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -995,20 +995,20 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1019,10 +1019,10 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1035,11 +1035,11 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1048,11 +1048,11 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1060,11 +1060,11 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1076,11 +1076,11 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1094,10 +1094,10 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1105,20 +1105,20 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1129,10 +1129,10 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1159,7 +1159,7 @@ func TestAccXRayGroup_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1194,7 +1194,7 @@ func TestAccXRayGroup_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -1224,7 +1224,7 @@ func TestAccXRayGroup_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1253,7 +1253,7 @@ func TestAccXRayGroup_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -1279,7 +1279,7 @@ func TestAccXRayGroup_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1311,7 +1311,7 @@ func TestAccXRayGroup_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1342,7 +1342,7 @@ func TestAccXRayGroup_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1376,7 +1376,7 @@ func TestAccXRayGroup_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1407,7 +1407,7 @@ func TestAccXRayGroup_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), @@ -1435,7 +1435,7 @@ func TestAccXRayGroup_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1464,7 +1464,7 @@ func TestAccXRayGroup_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1495,7 +1495,7 @@ func TestAccXRayGroup_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1524,10 +1524,10 @@ func TestAccXRayGroup_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing. ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1536,7 +1536,7 @@ func TestAccXRayGroup_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing. 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1544,7 +1544,7 @@ func TestAccXRayGroup_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing. 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1555,10 +1555,10 @@ func TestAccXRayGroup_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing. ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1639,7 +1639,7 @@ func TestAccXRayGroup_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1729,7 +1729,7 @@ func TestAccXRayGroup_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, diff --git a/internal/service/xray/sampling_rule_tags_gen_test.go b/internal/service/xray/sampling_rule_tags_gen_test.go index 376b91846b29..252549194e87 100644 --- a/internal/service/xray/sampling_rule_tags_gen_test.go +++ b/internal/service/xray/sampling_rule_tags_gen_test.go @@ -33,7 +33,7 @@ func TestAccXRaySamplingRule_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -61,7 +61,7 @@ func TestAccXRaySamplingRule_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -73,7 +73,7 @@ func TestAccXRaySamplingRule_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -105,7 +105,7 @@ func TestAccXRaySamplingRule_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -118,7 +118,7 @@ func TestAccXRaySamplingRule_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -146,7 +146,7 @@ func TestAccXRaySamplingRule_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), }, @@ -158,7 +158,7 @@ func TestAccXRaySamplingRule_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -179,7 +179,7 @@ func TestAccXRaySamplingRule_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -205,7 +205,7 @@ func TestAccXRaySamplingRule_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -228,7 +228,7 @@ func TestAccXRaySamplingRule_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -240,7 +240,7 @@ func TestAccXRaySamplingRule_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -265,7 +265,7 @@ func TestAccXRaySamplingRule_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -286,7 +286,7 @@ func TestAccXRaySamplingRule_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -314,7 +314,7 @@ func TestAccXRaySamplingRule_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -342,7 +342,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -369,7 +369,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -381,7 +381,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -402,7 +402,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -428,7 +428,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -456,7 +456,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -486,7 +486,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -499,7 +499,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -527,7 +527,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -555,7 +555,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -583,7 +583,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -610,7 +610,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -641,7 +641,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -670,7 +670,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -685,7 +685,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -718,7 +718,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -732,7 +732,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -762,7 +762,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -773,7 +773,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -796,7 +796,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -823,10 +823,10 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -834,22 +834,22 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -860,10 +860,10 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -876,10 +876,10 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -888,12 +888,12 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -901,12 +901,12 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -918,10 +918,10 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -934,7 +934,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -957,7 +957,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -984,10 +984,10 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -995,20 +995,20 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1019,10 +1019,10 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), }, ResourceName: resourceName, @@ -1035,11 +1035,11 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1048,11 +1048,11 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1060,11 +1060,11 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1076,11 +1076,11 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, @@ -1094,10 +1094,10 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1105,20 +1105,20 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1129,10 +1129,10 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1159,7 +1159,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_updateToProviderOnly(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1194,7 +1194,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_updateToProviderOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -1224,7 +1224,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_updateToProviderOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1253,7 +1253,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_updateToResourceOnly(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -1279,7 +1279,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_updateToResourceOnly(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1311,7 +1311,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_updateToResourceOnly(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1342,7 +1342,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1376,7 +1376,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_emptyResourceTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), }, @@ -1407,7 +1407,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), @@ -1435,7 +1435,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, }, ResourceName: resourceName, ImportState: true, @@ -1464,7 +1464,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nullOverlappingResourceTag(t *test acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1495,7 +1495,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nullOverlappingResourceTag(t *test acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), }, @@ -1524,10 +1524,10 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nullNonOverlappingResourceTag(t *t ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1536,7 +1536,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nullNonOverlappingResourceTag(t *t 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1544,7 +1544,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nullNonOverlappingResourceTag(t *t 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1555,10 +1555,10 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nullNonOverlappingResourceTag(t *t ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), }, ResourceName: resourceName, @@ -1639,7 +1639,7 @@ func TestAccXRaySamplingRule_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, @@ -1729,7 +1729,7 @@ func TestAccXRaySamplingRule_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), }, From 5608a1290fa121f7ce5c85ae3f2e9dec0a0d4c34 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:00 -0400 Subject: [PATCH 18/30] accessanalyzer: Fix formatting --- .../accessanalyzer/analyzer_tags_gen_test.go | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/service/accessanalyzer/analyzer_tags_gen_test.go b/internal/service/accessanalyzer/analyzer_tags_gen_test.go index 3cc61720c15c..3230590ee8cb 100644 --- a/internal/service/accessanalyzer/analyzer_tags_gen_test.go +++ b/internal/service/accessanalyzer/analyzer_tags_gen_test.go @@ -179,7 +179,7 @@ func testAccAccessAnalyzerAnalyzer_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -200,7 +200,7 @@ func testAccAccessAnalyzerAnalyzer_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -261,7 +261,7 @@ func testAccAccessAnalyzerAnalyzer_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -286,7 +286,7 @@ func testAccAccessAnalyzerAnalyzer_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -402,7 +402,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -423,7 +423,7 @@ func testAccAccessAnalyzerAnalyzer_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -794,7 +794,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -817,7 +817,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -902,7 +902,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -911,12 +911,12 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -924,12 +924,12 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -944,7 +944,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -955,7 +955,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -978,7 +978,7 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_nonOverlapping(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Analyzer/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1058,11 +1058,11 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1071,11 +1071,11 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1083,11 +1083,11 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1099,11 +1099,11 @@ func testAccAccessAnalyzerAnalyzer_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, From 799a3b826a8627dc3e0660ba1a1e1abc2a1c40da Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:00 -0400 Subject: [PATCH 19/30] acm: Fix formatting --- .../service/acm/certificate_tags_gen_test.go | 154 +++++++++--------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/internal/service/acm/certificate_tags_gen_test.go b/internal/service/acm/certificate_tags_gen_test.go index 8aef0264541c..9c06292cb1fa 100644 --- a/internal/service/acm/certificate_tags_gen_test.go +++ b/internal/service/acm/certificate_tags_gen_test.go @@ -172,9 +172,9 @@ func TestAccACMCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -194,9 +194,9 @@ func TestAccACMCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -265,9 +265,9 @@ func TestAccACMCertificate_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -292,9 +292,9 @@ func TestAccACMCertificate_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -420,9 +420,9 @@ func TestAccACMCertificate_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -442,9 +442,9 @@ func TestAccACMCertificate_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -705,9 +705,9 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -735,9 +735,9 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -754,9 +754,9 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -788,9 +788,9 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -806,9 +806,9 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -837,9 +837,9 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -852,9 +852,9 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -876,9 +876,9 @@ func TestAccACMCertificate_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -970,7 +970,7 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -981,12 +981,12 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -994,12 +994,12 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1013,7 +1013,7 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1029,9 +1029,9 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -1053,9 +1053,9 @@ func TestAccACMCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Certificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -1142,11 +1142,11 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1157,11 +1157,11 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1169,11 +1169,11 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1184,11 +1184,11 @@ func TestAccACMCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1312,9 +1312,9 @@ func TestAccACMCertificate_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -1343,9 +1343,9 @@ func TestAccACMCertificate_tags_DefaultTags_updateToProviderOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -1377,9 +1377,9 @@ func TestAccACMCertificate_tags_DefaultTags_updateToResourceOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -1544,9 +1544,9 @@ func TestAccACMCertificate_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), @@ -1573,9 +1573,9 @@ func TestAccACMCertificate_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, From bd2caaa37da314c33c073f2a60b0fecb24d9e504 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:00 -0400 Subject: [PATCH 20/30] acmpca: Fix formatting --- .../certificate_authority_tags_gen_test.go | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/service/acmpca/certificate_authority_tags_gen_test.go b/internal/service/acmpca/certificate_authority_tags_gen_test.go index a52f8d80dd69..28c3bc3dcc2d 100644 --- a/internal/service/acmpca/certificate_authority_tags_gen_test.go +++ b/internal/service/acmpca/certificate_authority_tags_gen_test.go @@ -165,7 +165,7 @@ func TestAccACMPCACertificateAuthority_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -186,7 +186,7 @@ func TestAccACMPCACertificateAuthority_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -253,7 +253,7 @@ func TestAccACMPCACertificateAuthority_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -278,7 +278,7 @@ func TestAccACMPCACertificateAuthority_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -400,7 +400,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -421,7 +421,7 @@ func TestAccACMPCACertificateAuthority_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -813,7 +813,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_providerOnly(t *testing. ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -836,7 +836,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_providerOnly(t *testing. ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -927,7 +927,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -936,12 +936,12 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -949,12 +949,12 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -969,7 +969,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -983,7 +983,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1006,7 +1006,7 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_nonOverlapping(t *testin ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/CertificateAuthority/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1092,11 +1092,11 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1105,11 +1105,11 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1117,11 +1117,11 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1133,11 +1133,11 @@ func TestAccACMPCACertificateAuthority_tags_DefaultTags_overlapping(t *testing.T acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, From be9969107c07791a6851bf01c7fd471c6464c87a Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:01 -0400 Subject: [PATCH 21/30] appsync: Fix formatting --- internal/service/appsync/appsync_test.go | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/internal/service/appsync/appsync_test.go b/internal/service/appsync/appsync_test.go index 1a450d16a58a..87117632e7a3 100644 --- a/internal/service/appsync/appsync_test.go +++ b/internal/service/appsync/appsync_test.go @@ -43,20 +43,20 @@ func TestAccAppSync_serial(t *testing.T) { "authenticationType": testAccGraphQLAPI_authenticationType, "AuthenticationType_apiKey": testAccGraphQLAPI_AuthenticationType_apiKey, "AuthenticationType_awsIAM": testAccGraphQLAPI_AuthenticationType_iam, - "AuthenticationType_amazonCognitoUserPools": testAccGraphQLAPI_AuthenticationType_amazonCognitoUserPools, - "AuthenticationType_openIDConnect": testAccGraphQLAPI_AuthenticationType_openIDConnect, - "AuthenticationType_awsLambda": testAccGraphQLAPI_AuthenticationType_lambda, - "log": testAccGraphQLAPI_log, - "Log_fieldLogLevel": testAccGraphQLAPI_Log_fieldLogLevel, - "Log_excludeVerboseContent": testAccGraphQLAPI_Log_excludeVerboseContent, - "OpenIDConnect_authTTL": testAccGraphQLAPI_OpenIDConnect_authTTL, - "OpenIDConnect_clientID": testAccGraphQLAPI_OpenIDConnect_clientID, - "OpenIDConnect_iatTTL": testAccGraphQLAPI_OpenIDConnect_iatTTL, - "OpenIDConnect_issuer": testAccGraphQLAPI_OpenIDConnect_issuer, - acctest.CtName: testAccGraphQLAPI_name, - "UserPool_awsRegion": testAccGraphQLAPI_UserPool_region, - "UserPool_defaultAction": testAccGraphQLAPI_UserPool_defaultAction, - "LambdaAuthorizerConfig_authorizerUri": testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerURI, + "AuthenticationType_amazonCognitoUserPools": testAccGraphQLAPI_AuthenticationType_amazonCognitoUserPools, + "AuthenticationType_openIDConnect": testAccGraphQLAPI_AuthenticationType_openIDConnect, + "AuthenticationType_awsLambda": testAccGraphQLAPI_AuthenticationType_lambda, + "log": testAccGraphQLAPI_log, + "Log_fieldLogLevel": testAccGraphQLAPI_Log_fieldLogLevel, + "Log_excludeVerboseContent": testAccGraphQLAPI_Log_excludeVerboseContent, + "OpenIDConnect_authTTL": testAccGraphQLAPI_OpenIDConnect_authTTL, + "OpenIDConnect_clientID": testAccGraphQLAPI_OpenIDConnect_clientID, + "OpenIDConnect_iatTTL": testAccGraphQLAPI_OpenIDConnect_iatTTL, + "OpenIDConnect_issuer": testAccGraphQLAPI_OpenIDConnect_issuer, + acctest.CtName: testAccGraphQLAPI_name, + "UserPool_awsRegion": testAccGraphQLAPI_UserPool_region, + "UserPool_defaultAction": testAccGraphQLAPI_UserPool_defaultAction, + "LambdaAuthorizerConfig_authorizerUri": testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerURI, "LambdaAuthorizerConfig_identityValidationExpression": testAccGraphQLAPI_LambdaAuthorizerConfig_identityValidationExpression, "LambdaAuthorizerConfig_authorizerResultTtlInSeconds": testAccGraphQLAPI_LambdaAuthorizerConfig_authorizerResultTTLInSeconds, "AdditionalAuthentication_apiKey": testAccGraphQLAPI_AdditionalAuthentication_apiKey, From e0bfbd5ec413cf97312a1412f491face8205c749 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:01 -0400 Subject: [PATCH 22/30] batch: Fix formatting --- .../compute_environment_tags_gen_test.go | 48 +++++++++---------- .../batch/job_definition_tags_gen_test.go | 48 +++++++++---------- .../service/batch/job_queue_tags_gen_test.go | 48 +++++++++---------- .../batch/scheduling_policy_tags_gen_test.go | 48 +++++++++---------- 4 files changed, 96 insertions(+), 96 deletions(-) diff --git a/internal/service/batch/compute_environment_tags_gen_test.go b/internal/service/batch/compute_environment_tags_gen_test.go index 42242afcc01f..b6fce89260ca 100644 --- a/internal/service/batch/compute_environment_tags_gen_test.go +++ b/internal/service/batch/compute_environment_tags_gen_test.go @@ -157,7 +157,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -178,7 +178,7 @@ func TestAccBatchComputeEnvironment_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -239,7 +239,7 @@ func TestAccBatchComputeEnvironment_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -264,7 +264,7 @@ func TestAccBatchComputeEnvironment_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -380,7 +380,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -401,7 +401,7 @@ func TestAccBatchComputeEnvironment_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -772,7 +772,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_providerOnly(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -795,7 +795,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_providerOnly(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -880,7 +880,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -889,12 +889,12 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -902,12 +902,12 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -922,7 +922,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -933,7 +933,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -956,7 +956,7 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_nonOverlapping(t *testing.T ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ComputeEnvironment/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1036,11 +1036,11 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1049,11 +1049,11 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1061,11 +1061,11 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1077,11 +1077,11 @@ func TestAccBatchComputeEnvironment_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/batch/job_definition_tags_gen_test.go b/internal/service/batch/job_definition_tags_gen_test.go index 47d7539fc54a..d8f4e40d78de 100644 --- a/internal/service/batch/job_definition_tags_gen_test.go +++ b/internal/service/batch/job_definition_tags_gen_test.go @@ -166,7 +166,7 @@ func TestAccBatchJobDefinition_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -187,7 +187,7 @@ func TestAccBatchJobDefinition_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -254,7 +254,7 @@ func TestAccBatchJobDefinition_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -279,7 +279,7 @@ func TestAccBatchJobDefinition_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -401,7 +401,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -422,7 +422,7 @@ func TestAccBatchJobDefinition_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -814,7 +814,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -837,7 +837,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -928,7 +928,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -937,12 +937,12 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -950,12 +950,12 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -970,7 +970,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -984,7 +984,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1007,7 +1007,7 @@ func TestAccBatchJobDefinition_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/JobDefinition/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1093,11 +1093,11 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1106,11 +1106,11 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1118,11 +1118,11 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1134,11 +1134,11 @@ func TestAccBatchJobDefinition_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/batch/job_queue_tags_gen_test.go b/internal/service/batch/job_queue_tags_gen_test.go index 67f613a4494b..738bd9f8c6cc 100644 --- a/internal/service/batch/job_queue_tags_gen_test.go +++ b/internal/service/batch/job_queue_tags_gen_test.go @@ -157,7 +157,7 @@ func TestAccBatchJobQueue_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -177,7 +177,7 @@ func TestAccBatchJobQueue_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -239,7 +239,7 @@ func TestAccBatchJobQueue_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -264,7 +264,7 @@ func TestAccBatchJobQueue_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -380,7 +380,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -400,7 +400,7 @@ func TestAccBatchJobQueue_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -772,7 +772,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -794,7 +794,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -879,7 +879,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -888,12 +888,12 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -901,12 +901,12 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -921,7 +921,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -932,7 +932,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -954,7 +954,7 @@ func TestAccBatchJobQueue_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/JobQueue/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1034,11 +1034,11 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1047,11 +1047,11 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1059,11 +1059,11 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1075,11 +1075,11 @@ func TestAccBatchJobQueue_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/batch/scheduling_policy_tags_gen_test.go b/internal/service/batch/scheduling_policy_tags_gen_test.go index 04fb7ff263a8..c8b4cbff6d6e 100644 --- a/internal/service/batch/scheduling_policy_tags_gen_test.go +++ b/internal/service/batch/scheduling_policy_tags_gen_test.go @@ -157,7 +157,7 @@ func TestAccBatchSchedulingPolicy_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -178,7 +178,7 @@ func TestAccBatchSchedulingPolicy_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -239,7 +239,7 @@ func TestAccBatchSchedulingPolicy_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -264,7 +264,7 @@ func TestAccBatchSchedulingPolicy_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -380,7 +380,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -401,7 +401,7 @@ func TestAccBatchSchedulingPolicy_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -772,7 +772,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -795,7 +795,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -880,7 +880,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -889,12 +889,12 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -902,12 +902,12 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -922,7 +922,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -933,7 +933,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -956,7 +956,7 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/SchedulingPolicy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1036,11 +1036,11 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1049,11 +1049,11 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1061,11 +1061,11 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1077,11 +1077,11 @@ func TestAccBatchSchedulingPolicy_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, From c987e9b4ef43b3718130029ba0b9910128662bb9 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:01 -0400 Subject: [PATCH 23/30] iam: Fix formatting --- .../iam/instance_profile_tags_gen_test.go | 48 ++--- .../openid_connect_provider_tags_gen_test.go | 48 ++--- internal/service/iam/policy_tags_gen_test.go | 48 ++--- internal/service/iam/role_tags_gen_test.go | 48 ++--- .../iam/server_certificate_tags_gen_test.go | 174 +++++++++--------- .../iam/service_linked_role_tags_gen_test.go | 48 ++--- internal/service/iam/user_tags_gen_test.go | 48 ++--- .../iam/virtual_mfa_device_tags_gen_test.go | 48 ++--- 8 files changed, 255 insertions(+), 255 deletions(-) diff --git a/internal/service/iam/instance_profile_tags_gen_test.go b/internal/service/iam/instance_profile_tags_gen_test.go index f202dca03bb3..5a3d789206b1 100644 --- a/internal/service/iam/instance_profile_tags_gen_test.go +++ b/internal/service/iam/instance_profile_tags_gen_test.go @@ -157,7 +157,7 @@ func TestAccIAMInstanceProfile_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -178,7 +178,7 @@ func TestAccIAMInstanceProfile_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -239,7 +239,7 @@ func TestAccIAMInstanceProfile_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -264,7 +264,7 @@ func TestAccIAMInstanceProfile_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -380,7 +380,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -401,7 +401,7 @@ func TestAccIAMInstanceProfile_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -772,7 +772,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -795,7 +795,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -880,7 +880,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -889,12 +889,12 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -902,12 +902,12 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -922,7 +922,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -933,7 +933,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -956,7 +956,7 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/InstanceProfile/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1036,11 +1036,11 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1049,11 +1049,11 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1061,11 +1061,11 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1077,11 +1077,11 @@ func TestAccIAMInstanceProfile_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/iam/openid_connect_provider_tags_gen_test.go b/internal/service/iam/openid_connect_provider_tags_gen_test.go index 6507cef68b47..70a15b807e6c 100644 --- a/internal/service/iam/openid_connect_provider_tags_gen_test.go +++ b/internal/service/iam/openid_connect_provider_tags_gen_test.go @@ -155,7 +155,7 @@ func TestAccIAMOpenIDConnectProvider_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -176,7 +176,7 @@ func TestAccIAMOpenIDConnectProvider_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -236,7 +236,7 @@ func TestAccIAMOpenIDConnectProvider_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -260,7 +260,7 @@ func TestAccIAMOpenIDConnectProvider_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -375,7 +375,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -396,7 +396,7 @@ func TestAccIAMOpenIDConnectProvider_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -764,7 +764,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_providerOnly(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -787,7 +787,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_providerOnly(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -871,7 +871,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -880,12 +880,12 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -893,12 +893,12 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -913,7 +913,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -924,7 +924,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -947,7 +947,7 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_nonOverlapping(t *testing. ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/OpenIDConnectProvider/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1026,11 +1026,11 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1039,11 +1039,11 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1051,11 +1051,11 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1067,11 +1067,11 @@ func TestAccIAMOpenIDConnectProvider_tags_DefaultTags_overlapping(t *testing.T) acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/iam/policy_tags_gen_test.go b/internal/service/iam/policy_tags_gen_test.go index 5402708d74c7..24ae027c4a49 100644 --- a/internal/service/iam/policy_tags_gen_test.go +++ b/internal/service/iam/policy_tags_gen_test.go @@ -157,7 +157,7 @@ func TestAccIAMPolicy_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -178,7 +178,7 @@ func TestAccIAMPolicy_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -239,7 +239,7 @@ func TestAccIAMPolicy_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -264,7 +264,7 @@ func TestAccIAMPolicy_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -380,7 +380,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -401,7 +401,7 @@ func TestAccIAMPolicy_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -772,7 +772,7 @@ func TestAccIAMPolicy_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -795,7 +795,7 @@ func TestAccIAMPolicy_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -880,7 +880,7 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -889,12 +889,12 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -902,12 +902,12 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -922,7 +922,7 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -933,7 +933,7 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -956,7 +956,7 @@ func TestAccIAMPolicy_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Policy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1036,11 +1036,11 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1049,11 +1049,11 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1061,11 +1061,11 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1077,11 +1077,11 @@ func TestAccIAMPolicy_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/iam/role_tags_gen_test.go b/internal/service/iam/role_tags_gen_test.go index 2eb1908a3c94..d4b1e07d5fcf 100644 --- a/internal/service/iam/role_tags_gen_test.go +++ b/internal/service/iam/role_tags_gen_test.go @@ -157,7 +157,7 @@ func TestAccIAMRole_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -178,7 +178,7 @@ func TestAccIAMRole_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -239,7 +239,7 @@ func TestAccIAMRole_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -264,7 +264,7 @@ func TestAccIAMRole_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -380,7 +380,7 @@ func TestAccIAMRole_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -401,7 +401,7 @@ func TestAccIAMRole_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -772,7 +772,7 @@ func TestAccIAMRole_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -795,7 +795,7 @@ func TestAccIAMRole_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -880,7 +880,7 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -889,12 +889,12 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -902,12 +902,12 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -922,7 +922,7 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -933,7 +933,7 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -956,7 +956,7 @@ func TestAccIAMRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Role/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1036,11 +1036,11 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1049,11 +1049,11 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1061,11 +1061,11 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1077,11 +1077,11 @@ func TestAccIAMRole_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/iam/server_certificate_tags_gen_test.go b/internal/service/iam/server_certificate_tags_gen_test.go index 7543c3053573..3ef8d2d6466f 100644 --- a/internal/service/iam/server_certificate_tags_gen_test.go +++ b/internal/service/iam/server_certificate_tags_gen_test.go @@ -183,10 +183,10 @@ func TestAccIAMServerCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -206,10 +206,10 @@ func TestAccIAMServerCertificate_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -283,10 +283,10 @@ func TestAccIAMServerCertificate_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, PlanOnly: true, ExpectNonEmptyPlan: false, @@ -312,10 +312,10 @@ func TestAccIAMServerCertificate_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -448,10 +448,10 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -471,10 +471,10 @@ func TestAccIAMServerCertificate_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -751,9 +751,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -782,9 +782,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -803,9 +803,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -838,9 +838,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -858,9 +858,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -890,9 +890,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -906,10 +906,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -931,10 +931,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -1032,7 +1032,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1043,12 +1043,12 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1056,12 +1056,12 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1076,7 +1076,7 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1093,10 +1093,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -1118,10 +1118,10 @@ func TestAccIAMServerCertificate_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ServerCertificate/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -1214,11 +1214,11 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1229,11 +1229,11 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1241,11 +1241,11 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1257,11 +1257,11 @@ func TestAccIAMServerCertificate_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), "certificate_pem": config.StringVariable(certificatePEM), "private_key_pem": config.StringVariable(privateKeyPEM), @@ -1392,9 +1392,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_updateToProviderOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -1424,9 +1424,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_updateToProviderOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, @@ -1461,9 +1461,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_updateToResourceOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -1637,9 +1637,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_emptyProviderOnlyTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &v), @@ -1667,9 +1667,9 @@ func TestAccIAMServerCertificate_tags_DefaultTags_emptyProviderOnlyTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - acctest.CtResourceTags: nil, - "certificate_pem": config.StringVariable(certificatePEM), - "private_key_pem": config.StringVariable(privateKeyPEM), + acctest.CtResourceTags: nil, + "certificate_pem": config.StringVariable(certificatePEM), + "private_key_pem": config.StringVariable(privateKeyPEM), }, ResourceName: resourceName, ImportState: true, diff --git a/internal/service/iam/service_linked_role_tags_gen_test.go b/internal/service/iam/service_linked_role_tags_gen_test.go index 1cd53dc30ed4..38c81c3a1b65 100644 --- a/internal/service/iam/service_linked_role_tags_gen_test.go +++ b/internal/service/iam/service_linked_role_tags_gen_test.go @@ -155,7 +155,7 @@ func TestAccIAMServiceLinkedRole_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -176,7 +176,7 @@ func TestAccIAMServiceLinkedRole_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -236,7 +236,7 @@ func TestAccIAMServiceLinkedRole_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -260,7 +260,7 @@ func TestAccIAMServiceLinkedRole_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -375,7 +375,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -396,7 +396,7 @@ func TestAccIAMServiceLinkedRole_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -764,7 +764,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -787,7 +787,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -871,7 +871,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -880,12 +880,12 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -893,12 +893,12 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -913,7 +913,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -924,7 +924,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -947,7 +947,7 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ServiceLinkedRole/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1026,11 +1026,11 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1039,11 +1039,11 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1051,11 +1051,11 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1067,11 +1067,11 @@ func TestAccIAMServiceLinkedRole_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/iam/user_tags_gen_test.go b/internal/service/iam/user_tags_gen_test.go index 4a811a2c9550..a4ebdb50637b 100644 --- a/internal/service/iam/user_tags_gen_test.go +++ b/internal/service/iam/user_tags_gen_test.go @@ -166,7 +166,7 @@ func TestAccIAMUser_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -187,7 +187,7 @@ func TestAccIAMUser_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -254,7 +254,7 @@ func TestAccIAMUser_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -279,7 +279,7 @@ func TestAccIAMUser_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -401,7 +401,7 @@ func TestAccIAMUser_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -422,7 +422,7 @@ func TestAccIAMUser_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -814,7 +814,7 @@ func TestAccIAMUser_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -837,7 +837,7 @@ func TestAccIAMUser_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -928,7 +928,7 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -937,12 +937,12 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -950,12 +950,12 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -970,7 +970,7 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -984,7 +984,7 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1007,7 +1007,7 @@ func TestAccIAMUser_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/User/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1093,11 +1093,11 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1106,11 +1106,11 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1118,11 +1118,11 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1134,11 +1134,11 @@ func TestAccIAMUser_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/iam/virtual_mfa_device_tags_gen_test.go b/internal/service/iam/virtual_mfa_device_tags_gen_test.go index 7a13b1b583bf..71a09979d8e0 100644 --- a/internal/service/iam/virtual_mfa_device_tags_gen_test.go +++ b/internal/service/iam/virtual_mfa_device_tags_gen_test.go @@ -166,7 +166,7 @@ func TestAccIAMVirtualMFADevice_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -187,7 +187,7 @@ func TestAccIAMVirtualMFADevice_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -254,7 +254,7 @@ func TestAccIAMVirtualMFADevice_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -279,7 +279,7 @@ func TestAccIAMVirtualMFADevice_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -401,7 +401,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -422,7 +422,7 @@ func TestAccIAMVirtualMFADevice_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -814,7 +814,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -837,7 +837,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -928,7 +928,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -937,12 +937,12 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -950,12 +950,12 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -970,7 +970,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -984,7 +984,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1007,7 +1007,7 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/VirtualMFADevice/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1093,11 +1093,11 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1106,11 +1106,11 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1118,11 +1118,11 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1134,11 +1134,11 @@ func TestAccIAMVirtualMFADevice_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, From 5bd8f1ac0f01516ead7cd15badcd711ce7c0390d Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:01 -0400 Subject: [PATCH 24/30] licensemanager: Fix formatting --- internal/service/licensemanager/grant_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/licensemanager/grant_test.go b/internal/service/licensemanager/grant_test.go index ec3af6ef573f..147b316bc113 100644 --- a/internal/service/licensemanager/grant_test.go +++ b/internal/service/licensemanager/grant_test.go @@ -39,7 +39,7 @@ func TestAccLicenseManagerGrant_serial(t *testing.T) { "grant": { acctest.CtBasic: testAccGrant_basic, "disappears": testAccGrant_disappears, - acctest.CtName: testAccGrant_name, + acctest.CtName: testAccGrant_name, }, "grant_accepter": { acctest.CtBasic: testAccGrantAccepter_basic, From a4e7f63fb8b7f711a58286f8c6a0b2d0bcfb3ef2 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:01 -0400 Subject: [PATCH 25/30] lightsail: Fix formatting --- internal/service/lightsail/lb_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/lightsail/lb_test.go b/internal/service/lightsail/lb_test.go index 42354bdd3fbf..158b40e38245 100644 --- a/internal/service/lightsail/lb_test.go +++ b/internal/service/lightsail/lb_test.go @@ -34,7 +34,7 @@ func TestAccLightsailLoadBalancer_serial(t *testing.T) { "lb": { acctest.CtBasic: testAccLoadBalancer_basic, "disappears": testAccLoadBalancer_disappears, - acctest.CtName: testAccLoadBalancer_name, + acctest.CtName: testAccLoadBalancer_name, "health_check_path": testAccLoadBalancer_healthCheckPath, "tags": testAccLoadBalancer_tags, }, From 4db0a2be468f32414754ef6effdf5aaecbfdef5d Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:01 -0400 Subject: [PATCH 26/30] s3: Fix formatting --- .../service/s3/bucket_object_tags_gen_test.go | 48 +++++++++---------- internal/service/s3/bucket_tags_gen_test.go | 48 +++++++++---------- .../service/s3/object_copy_tags_gen_test.go | 34 ++++++------- internal/service/s3/object_tags_gen_test.go | 48 +++++++++---------- 4 files changed, 89 insertions(+), 89 deletions(-) diff --git a/internal/service/s3/bucket_object_tags_gen_test.go b/internal/service/s3/bucket_object_tags_gen_test.go index f9d09119c27c..2503abe633b4 100644 --- a/internal/service/s3/bucket_object_tags_gen_test.go +++ b/internal/service/s3/bucket_object_tags_gen_test.go @@ -169,7 +169,7 @@ func TestAccS3BucketObject_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -190,7 +190,7 @@ func TestAccS3BucketObject_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -259,7 +259,7 @@ func TestAccS3BucketObject_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -284,7 +284,7 @@ func TestAccS3BucketObject_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -408,7 +408,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -429,7 +429,7 @@ func TestAccS3BucketObject_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -828,7 +828,7 @@ func TestAccS3BucketObject_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -851,7 +851,7 @@ func TestAccS3BucketObject_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -944,7 +944,7 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -953,12 +953,12 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -966,12 +966,12 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -986,7 +986,7 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1001,7 +1001,7 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1024,7 +1024,7 @@ func TestAccS3BucketObject_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/BucketObject/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1112,11 +1112,11 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1125,11 +1125,11 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1137,11 +1137,11 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1153,11 +1153,11 @@ func TestAccS3BucketObject_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/s3/bucket_tags_gen_test.go b/internal/service/s3/bucket_tags_gen_test.go index 5ff04880bb65..2b29ab265a8a 100644 --- a/internal/service/s3/bucket_tags_gen_test.go +++ b/internal/service/s3/bucket_tags_gen_test.go @@ -164,7 +164,7 @@ func TestAccS3Bucket_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -185,7 +185,7 @@ func TestAccS3Bucket_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -251,7 +251,7 @@ func TestAccS3Bucket_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -275,7 +275,7 @@ func TestAccS3Bucket_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -396,7 +396,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -417,7 +417,7 @@ func TestAccS3Bucket_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -806,7 +806,7 @@ func TestAccS3Bucket_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -829,7 +829,7 @@ func TestAccS3Bucket_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -919,7 +919,7 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -928,12 +928,12 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -941,12 +941,12 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -961,7 +961,7 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -975,7 +975,7 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -998,7 +998,7 @@ func TestAccS3Bucket_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Bucket/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1083,11 +1083,11 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1096,11 +1096,11 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1108,11 +1108,11 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1124,11 +1124,11 @@ func TestAccS3Bucket_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/s3/object_copy_tags_gen_test.go b/internal/service/s3/object_copy_tags_gen_test.go index 28ef8a4b9330..7a015b0dbf93 100644 --- a/internal/service/s3/object_copy_tags_gen_test.go +++ b/internal/service/s3/object_copy_tags_gen_test.go @@ -121,7 +121,7 @@ func TestAccS3ObjectCopy_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -181,7 +181,7 @@ func TestAccS3ObjectCopy_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -205,7 +205,7 @@ func TestAccS3ObjectCopy_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -297,7 +297,7 @@ func TestAccS3ObjectCopy_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -600,7 +600,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -681,7 +681,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -690,12 +690,12 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -703,12 +703,12 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -718,7 +718,7 @@ func TestAccS3ObjectCopy_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ObjectCopy/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -794,11 +794,11 @@ func TestAccS3ObjectCopy_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -807,11 +807,11 @@ func TestAccS3ObjectCopy_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -819,11 +819,11 @@ func TestAccS3ObjectCopy_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, diff --git a/internal/service/s3/object_tags_gen_test.go b/internal/service/s3/object_tags_gen_test.go index cf31504d3e73..c856919bdd7f 100644 --- a/internal/service/s3/object_tags_gen_test.go +++ b/internal/service/s3/object_tags_gen_test.go @@ -169,7 +169,7 @@ func TestAccS3Object_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -190,7 +190,7 @@ func TestAccS3Object_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -259,7 +259,7 @@ func TestAccS3Object_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -284,7 +284,7 @@ func TestAccS3Object_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -408,7 +408,7 @@ func TestAccS3Object_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -429,7 +429,7 @@ func TestAccS3Object_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -828,7 +828,7 @@ func TestAccS3Object_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -851,7 +851,7 @@ func TestAccS3Object_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -944,7 +944,7 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -953,12 +953,12 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -966,12 +966,12 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -986,7 +986,7 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -1001,7 +1001,7 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1024,7 +1024,7 @@ func TestAccS3Object_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Object/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1112,11 +1112,11 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1125,11 +1125,11 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1137,11 +1137,11 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1153,11 +1153,11 @@ func TestAccS3Object_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, From a3f50938b2eeb783bb34bb784343b1894325fb34 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:02 -0400 Subject: [PATCH 27/30] servicecatalog: Fix formatting --- .../servicecatalog/portfolio_tags_gen_test.go | 48 +++++++++---------- .../servicecatalog/product_tags_gen_test.go | 48 +++++++++---------- .../provisioned_product_tags_gen_test.go | 48 +++++++++---------- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/internal/service/servicecatalog/portfolio_tags_gen_test.go b/internal/service/servicecatalog/portfolio_tags_gen_test.go index fe38630742c4..b319e73aa7bc 100644 --- a/internal/service/servicecatalog/portfolio_tags_gen_test.go +++ b/internal/service/servicecatalog/portfolio_tags_gen_test.go @@ -157,7 +157,7 @@ func TestAccServiceCatalogPortfolio_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -178,7 +178,7 @@ func TestAccServiceCatalogPortfolio_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -239,7 +239,7 @@ func TestAccServiceCatalogPortfolio_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -264,7 +264,7 @@ func TestAccServiceCatalogPortfolio_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -382,7 +382,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -403,7 +403,7 @@ func TestAccServiceCatalogPortfolio_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -778,7 +778,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_providerOnly(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -801,7 +801,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_providerOnly(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -886,7 +886,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -895,12 +895,12 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -908,12 +908,12 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -928,7 +928,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -939,7 +939,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -962,7 +962,7 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_nonOverlapping(t *testing.T ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Portfolio/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1042,11 +1042,11 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1055,11 +1055,11 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1067,11 +1067,11 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1083,11 +1083,11 @@ func TestAccServiceCatalogPortfolio_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/servicecatalog/product_tags_gen_test.go b/internal/service/servicecatalog/product_tags_gen_test.go index fd40e66a22a0..c1cd90dfea3f 100644 --- a/internal/service/servicecatalog/product_tags_gen_test.go +++ b/internal/service/servicecatalog/product_tags_gen_test.go @@ -164,7 +164,7 @@ func TestAccServiceCatalogProduct_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -185,7 +185,7 @@ func TestAccServiceCatalogProduct_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -251,7 +251,7 @@ func TestAccServiceCatalogProduct_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -275,7 +275,7 @@ func TestAccServiceCatalogProduct_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -398,7 +398,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -419,7 +419,7 @@ func TestAccServiceCatalogProduct_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -812,7 +812,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -835,7 +835,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -925,7 +925,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -934,12 +934,12 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -947,12 +947,12 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -967,7 +967,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -981,7 +981,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1004,7 +1004,7 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_nonOverlapping(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Product/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1089,11 +1089,11 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1102,11 +1102,11 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1114,11 +1114,11 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1130,11 +1130,11 @@ func TestAccServiceCatalogProduct_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/servicecatalog/provisioned_product_tags_gen_test.go b/internal/service/servicecatalog/provisioned_product_tags_gen_test.go index 3991a8edb1a6..f9505f76b725 100644 --- a/internal/service/servicecatalog/provisioned_product_tags_gen_test.go +++ b/internal/service/servicecatalog/provisioned_product_tags_gen_test.go @@ -168,7 +168,7 @@ func TestAccServiceCatalogProvisionedProduct_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -190,7 +190,7 @@ func TestAccServiceCatalogProvisionedProduct_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -258,7 +258,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -283,7 +283,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -407,7 +407,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnCreate(t *testing.T { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -428,7 +428,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_EmptyTag_OnCreate(t *testing.T { ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -826,7 +826,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_providerOnly(t *te ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -850,7 +850,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_providerOnly(t *te ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -942,7 +942,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -951,12 +951,12 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -964,12 +964,12 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -984,7 +984,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -998,7 +998,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1022,7 +1022,7 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_nonOverlapping(t * ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/ProvisionedProduct/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1109,11 +1109,11 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1122,11 +1122,11 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1134,11 +1134,11 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1150,11 +1150,11 @@ func TestAccServiceCatalogProvisionedProduct_tags_DefaultTags_overlapping(t *tes acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, From 88edd37c1c62cbc8bbb7aa5517a34ebf9e923911 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:02 -0400 Subject: [PATCH 28/30] ssmcontacts: Fix formatting --- internal/service/ssmcontacts/ssmcontacts_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ssmcontacts/ssmcontacts_test.go b/internal/service/ssmcontacts/ssmcontacts_test.go index c4e3573a7f79..2c878996e23a 100644 --- a/internal/service/ssmcontacts/ssmcontacts_test.go +++ b/internal/service/ssmcontacts/ssmcontacts_test.go @@ -31,7 +31,7 @@ func TestAccSSMContacts_serial(t *testing.T) { "contactId": testAccContactChannel_contactID, "deliveryAddress": testAccContactChannel_deliveryAddress, "disappears": testAccContactChannel_disappears, - acctest.CtName: testAccContactChannel_name, + acctest.CtName: testAccContactChannel_name, "type": testAccContactChannel_type, }, "Contact Channel Data Source Tests": { From 2a3b583e9db8bfd2c72216f8d7c203e5901b1d19 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:43:02 -0400 Subject: [PATCH 29/30] xray: Fix formatting --- internal/service/xray/group_tags_gen_test.go | 48 +++++++++---------- .../xray/sampling_rule_tags_gen_test.go | 48 +++++++++---------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/internal/service/xray/group_tags_gen_test.go b/internal/service/xray/group_tags_gen_test.go index a0d3f4d3fdb7..b32e52ea9a12 100644 --- a/internal/service/xray/group_tags_gen_test.go +++ b/internal/service/xray/group_tags_gen_test.go @@ -157,7 +157,7 @@ func TestAccXRayGroup_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -178,7 +178,7 @@ func TestAccXRayGroup_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -239,7 +239,7 @@ func TestAccXRayGroup_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -264,7 +264,7 @@ func TestAccXRayGroup_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -380,7 +380,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -401,7 +401,7 @@ func TestAccXRayGroup_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -772,7 +772,7 @@ func TestAccXRayGroup_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -795,7 +795,7 @@ func TestAccXRayGroup_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -880,7 +880,7 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -889,12 +889,12 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -902,12 +902,12 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -922,7 +922,7 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -933,7 +933,7 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -956,7 +956,7 @@ func TestAccXRayGroup_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Group/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1036,11 +1036,11 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1049,11 +1049,11 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1061,11 +1061,11 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1077,11 +1077,11 @@ func TestAccXRayGroup_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, diff --git a/internal/service/xray/sampling_rule_tags_gen_test.go b/internal/service/xray/sampling_rule_tags_gen_test.go index 252549194e87..5b03776ab3d7 100644 --- a/internal/service/xray/sampling_rule_tags_gen_test.go +++ b/internal/service/xray/sampling_rule_tags_gen_test.go @@ -157,7 +157,7 @@ func TestAccXRaySamplingRule_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -178,7 +178,7 @@ func TestAccXRaySamplingRule_tags(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -239,7 +239,7 @@ func TestAccXRaySamplingRule_tags_null(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, PlanOnly: true, @@ -264,7 +264,7 @@ func TestAccXRaySamplingRule_tags_AddOnUpdate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -380,7 +380,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -401,7 +401,7 @@ func TestAccXRaySamplingRule_tags_EmptyTag_OnCreate(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -772,7 +772,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -795,7 +795,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_providerOnly(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -880,7 +880,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -889,12 +889,12 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -902,12 +902,12 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), - "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), + "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -922,7 +922,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), - "resourcekey2": config.StringVariable(acctest.CtResourceValue2), + "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, @@ -933,7 +933,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( @@ -956,7 +956,7 @@ func TestAccXRaySamplingRule_tags_DefaultTags_nonOverlapping(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/SamplingRule/tags/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), + acctest.CtRName: config.StringVariable(rName), acctest.CtResourceTags: nil, }, ResourceName: resourceName, @@ -1036,11 +1036,11 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, Check: resource.ComposeAggregateTestCheckFunc( @@ -1049,11 +1049,11 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1061,11 +1061,11 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), - "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), + "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1077,11 +1077,11 @@ func TestAccXRaySamplingRule_tags_DefaultTags_overlapping(t *testing.T) { acctest.CtRName: config.StringVariable(rName), acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), - "overlapkey2": config.StringVariable("providervalue2"), + "overlapkey2": config.StringVariable("providervalue2"), }), acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), - "overlapkey2": config.StringVariable(acctest.CtResourceValue2), + "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), }, ResourceName: resourceName, From 9a43aad667fe03379de568a9d176372617b06a2c Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 24 May 2024 10:59:06 -0400 Subject: [PATCH 30/30] generate: Fix constants in generator --- internal/generate/tagstests/test.go.gtpl | 224 +++++++++++------------ 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/internal/generate/tagstests/test.go.gtpl b/internal/generate/tagstests/test.go.gtpl index 34942039ed40..b689dd1ca6df 100644 --- a/internal/generate/tagstests/test.go.gtpl +++ b/internal/generate/tagstests/test.go.gtpl @@ -101,7 +101,7 @@ func {{ template "testname" . }}_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -133,7 +133,7 @@ func {{ template "testname" . }}_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -147,7 +147,7 @@ func {{ template "testname" . }}_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -183,7 +183,7 @@ func {{ template "testname" . }}_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), @@ -198,7 +198,7 @@ func {{ template "testname" . }}_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -233,7 +233,7 @@ func {{ template "testname" . }}_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -250,7 +250,7 @@ func {{ template "testname" . }}_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -282,7 +282,7 @@ func {{ template "testname" . }}_tags(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -310,7 +310,7 @@ func {{ template "testname" . }}_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), {{ range $name, $value := .AdditionalTfVars -}} @@ -341,7 +341,7 @@ func {{ template "testname" . }}_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), {{ range $name, $value := .AdditionalTfVars -}} @@ -355,7 +355,7 @@ func {{ template "testname" . }}_tags_null(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -377,7 +377,7 @@ func {{ template "testname" . }}_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -405,7 +405,7 @@ func {{ template "testname" . }}_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -437,7 +437,7 @@ func {{ template "testname" . }}_tags_AddOnUpdate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -464,7 +464,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -501,7 +501,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -515,7 +515,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -544,7 +544,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnCreate(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -569,7 +569,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -600,7 +600,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -641,7 +641,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), acctest.CtKey2: config.StringVariable(""), }), @@ -656,7 +656,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -688,7 +688,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -715,7 +715,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -746,7 +746,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -783,7 +783,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -811,7 +811,7 @@ func {{ template "testname" . }}_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -844,7 +844,7 @@ func {{ template "testname" . }}_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -861,7 +861,7 @@ func {{ template "testname" . }}_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -902,7 +902,7 @@ func {{ template "testname" . }}_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -918,7 +918,7 @@ func {{ template "testname" . }}_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -959,7 +959,7 @@ func {{ template "testname" . }}_tags_DefaultTags_providerOnly(t *testing.T) { acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey2: config.StringVariable(acctest.CtValue2), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -975,7 +975,7 @@ func {{ template "testname" . }}_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -1009,7 +1009,7 @@ func {{ template "testname" . }}_tags_DefaultTags_providerOnly(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -1036,10 +1036,10 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), @@ -1050,22 +1050,22 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), - "resourcekey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1077,10 +1077,10 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), }), {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), @@ -1095,10 +1095,10 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1110,12 +1110,12 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1123,12 +1123,12 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "providerkey1": knownvalue.StringExact("providervalue1updated"), - "resourcekey1": knownvalue.StringExact("resourcevalue1updated"), + acctest.CtProviderKey1: knownvalue.StringExact("providervalue1updated"), + acctest.CtResourceKey1: knownvalue.StringExact("resourcevalue1updated"), "resourcekey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1141,10 +1141,10 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable("providervalue1updated"), + acctest.CtProviderKey1: config.StringVariable("providervalue1updated"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": config.StringVariable("resourcevalue1updated"), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable("resourcevalue1updated"), "resourcekey2": config.StringVariable(acctest.CtResourceValue2), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1159,7 +1159,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -1193,7 +1193,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -1220,10 +1220,10 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), @@ -1234,20 +1234,20 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), }, }, @@ -1259,10 +1259,10 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), }), {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), @@ -1277,11 +1277,11 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1293,11 +1293,11 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1305,11 +1305,11 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) { PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), "overlapkey2": knownvalue.StringExact(acctest.CtResourceValue2), })), }, @@ -1322,11 +1322,11 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), "overlapkey2": config.StringVariable("providervalue2"), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), "overlapkey2": config.StringVariable(acctest.CtResourceValue2), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1342,10 +1342,10 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), @@ -1356,20 +1356,20 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) { ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + 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{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ - "overlapkey1": knownvalue.StringExact(acctest.CtResourceValue2), + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), })), }, }, @@ -1381,10 +1381,10 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) { ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "overlapkey1": config.StringVariable(acctest.CtResourceValue2), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), }), {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), @@ -1408,7 +1408,7 @@ func {{ template "testname" . }}_tags_DefaultTags_updateToProviderOnly(t *testin ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1446,7 +1446,7 @@ func {{ template "testname" . }}_tags_DefaultTags_updateToProviderOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -1484,7 +1484,7 @@ func {{ template "testname" . }}_tags_DefaultTags_updateToProviderOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -1510,7 +1510,7 @@ func {{ template "testname" . }}_tags_DefaultTags_updateToResourceOnly(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -1539,7 +1539,7 @@ func {{ template "testname" . }}_tags_DefaultTags_updateToResourceOnly(t *testin ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1575,7 +1575,7 @@ func {{ template "testname" . }}_tags_DefaultTags_updateToResourceOnly(t *testin ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1606,7 +1606,7 @@ func {{ template "testname" . }}_tags_DefaultTags_emptyResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1650,7 +1650,7 @@ func {{ template "testname" . }}_tags_DefaultTags_emptyResourceTag(t *testing.T) acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1681,7 +1681,7 @@ func {{ template "testname" . }}_tags_DefaultTags_emptyProviderOnlyTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -1719,7 +1719,7 @@ func {{ template "testname" . }}_tags_DefaultTags_emptyProviderOnlyTag(t *testin acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(""), }), - "resource_tags": nil, + acctest.CtResourceTags: nil, {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), {{ end }} @@ -1748,7 +1748,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nullOverlappingResourceTag(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1783,7 +1783,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nullOverlappingResourceTag(t * acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: nil, }), {{ range $name, $value := .AdditionalTfVars -}} @@ -1812,10 +1812,10 @@ func {{ template "testname" . }}_tags_DefaultTags_nullNonOverlappingResourceTag( ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), @@ -1827,7 +1827,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nullNonOverlappingResourceTag( 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -1835,7 +1835,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nullNonOverlappingResourceTag( 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{ - "providerkey1": knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), })), }, }, @@ -1847,10 +1847,10 @@ func {{ template "testname" . }}_tags_DefaultTags_nullNonOverlappingResourceTag( ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ - "providerkey1": config.StringVariable(acctest.CtProviderValue1), + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), }), - "resource_tags": config.MapVariable(map[string]config.Variable{ - "resourcekey1": nil, + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, }), {{ range $name, $value := .AdditionalTfVars -}} "{{ $name }}": config.StringVariable({{ $value }}), @@ -1929,7 +1929,7 @@ func {{ template "testname" . }}_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}} @@ -2023,7 +2023,7 @@ func {{ template "testname" . }}_tags_ComputedTag_OnUpdate_Replace(t *testing.T) ConfigDirectory: config.StaticDirectory("testdata/{{ .Name }}/tags/"), ConfigVariables: config.Variables{ {{ if .Generator }} acctest.CtRName: config.StringVariable(rName),{{ end }} - "resource_tags": config.MapVariable(map[string]config.Variable{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ acctest.CtKey1: config.StringVariable(acctest.CtValue1), }), {{ range $name, $value := .AdditionalTfVars -}}