Skip to content

Commit 59a92ec

Browse files
stefanfreitagstefanfreitag
committed
fix: fix formatting issues
1 parent d023398 commit 59a92ec

File tree

4 files changed

+45
-34
lines changed

4 files changed

+45
-34
lines changed

‎.changelog/44473.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
```release-note:enhancement
2+
resource/aws_route53recoverycontrolconfig_cluster: Add tagging support
3+
```
4+
5+
```release-note:enhancement
6+
resource/aws_route53recoverycontrolconfig_control_panel: Add tagging support
7+
```
8+
9+
```release-note:enhancement
10+
resource/aws_route53recoverycontrolconfig_safety_rule: Add tagging support
11+
```

‎internal/service/route53recoverycontrolconfig/cluster_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@ func testAccCluster_tags(t *testing.T) {
131131
CheckDestroy: testAccCheckClusterDestroy(ctx),
132132
Steps: []resource.TestStep{
133133
{
134-
Config: testAccClusterConfig_tags1(rName, "key1", "value1"),
134+
Config: testAccClusterConfig_tags1(rName, acctest.CtKey1, acctest.CtValue1),
135135
Check: resource.ComposeTestCheckFunc(
136136
testAccCheckClusterExists(ctx, resourceName),
137137
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
138138
resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "DEPLOYED"),
139139
resource.TestCheckResourceAttr(resourceName, "cluster_endpoints.#", "5"),
140-
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
141-
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"),
140+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"),
141+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1),
142142
),
143143
},
144144
{
@@ -149,26 +149,26 @@ func testAccCluster_tags(t *testing.T) {
149149
},
150150

151151
{
152-
Config: testAccClusterConfig_tags2(rName, "key1", "value1updated", "key2", "value2"),
152+
Config: testAccClusterConfig_tags2(rName, acctest.CtKey1, acctest.CtValue1Updated, acctest.CtKey2, acctest.CtValue2),
153153
Check: resource.ComposeTestCheckFunc(
154154
testAccCheckClusterExists(ctx, resourceName),
155155
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
156156
resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "DEPLOYED"),
157157
resource.TestCheckResourceAttr(resourceName, "cluster_endpoints.#", "5"),
158-
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
159-
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"),
160-
resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"),
158+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"),
159+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated),
160+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2),
161161
),
162162
},
163163
{
164-
Config: testAccClusterConfig_tags1(rName, "key2", "value2"),
164+
Config: testAccClusterConfig_tags1(rName, acctest.CtKey2, acctest.CtValue2),
165165
Check: resource.ComposeTestCheckFunc(
166166
testAccCheckClusterExists(ctx, resourceName),
167167
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
168168
resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "DEPLOYED"),
169169
resource.TestCheckResourceAttr(resourceName, "cluster_endpoints.#", "5"),
170-
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
171-
resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"),
170+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"),
171+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2),
172172
),
173173
},
174174
},

‎internal/service/route53recoverycontrolconfig/control_panel_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ func testAccControlPanel_tags(t *testing.T) {
6868
CheckDestroy: testAccCheckControlPanelDestroy(ctx),
6969
Steps: []resource.TestStep{
7070
{
71-
Config: testAccControlPanelConfig_tags1(rName, "key1", "value1"),
71+
Config: testAccControlPanelConfig_tags1(rName, acctest.CtKey1, acctest.CtValue1),
7272
Check: resource.ComposeTestCheckFunc(
7373
testAccCheckControlPanelExists(ctx, resourceName),
7474
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
7575
resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "DEPLOYED"),
7676
resource.TestCheckResourceAttr(resourceName, "default_control_panel", acctest.CtFalse),
7777
resource.TestCheckResourceAttr(resourceName, "routing_control_count", "0"),
78-
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
79-
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"),
78+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"),
79+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1),
8080
),
8181
},
8282
{
@@ -85,28 +85,28 @@ func testAccControlPanel_tags(t *testing.T) {
8585
ImportStateVerify: true,
8686
},
8787
{
88-
Config: testAccControlPanelConfig_tags2(rName, "key1", "value1updated", "key2", "value2"),
88+
Config: testAccControlPanelConfig_tags2(rName, acctest.CtKey1, acctest.CtValue1Updated, acctest.CtKey2, acctest.CtValue2),
8989
Check: resource.ComposeTestCheckFunc(
9090
testAccCheckControlPanelExists(ctx, resourceName),
9191
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
9292
resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "DEPLOYED"),
9393
resource.TestCheckResourceAttr(resourceName, "default_control_panel", acctest.CtFalse),
9494
resource.TestCheckResourceAttr(resourceName, "routing_control_count", "0"),
95-
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
96-
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"),
97-
resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"),
95+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"),
96+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated),
97+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2),
9898
),
9999
},
100100
{
101-
Config: testAccControlPanelConfig_tags1(rName, "key2", "value2"),
101+
Config: testAccControlPanelConfig_tags1(rName, acctest.CtKey2, acctest.CtValue2),
102102
Check: resource.ComposeTestCheckFunc(
103103
testAccCheckControlPanelExists(ctx, resourceName),
104104
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
105105
resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "DEPLOYED"),
106106
resource.TestCheckResourceAttr(resourceName, "default_control_panel", acctest.CtFalse),
107107
resource.TestCheckResourceAttr(resourceName, "routing_control_count", "0"),
108-
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
109-
resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"),
108+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"),
109+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2),
110110
),
111111
},
112112
},

‎internal/service/route53recoverycontrolconfig/safety_rule_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func testAccSafetyRule_tags(t *testing.T) {
130130
CheckDestroy: testAccCheckSafetyRuleDestroy(ctx),
131131
Steps: []resource.TestStep{
132132
{
133-
Config: testAccSafetyRuleConfig_routingControl_tags1(rName, "key1", "value1"),
133+
Config: testAccSafetyRuleConfig_routingControl_tags1(rName, acctest.CtKey1, acctest.CtValue1),
134134
Check: resource.ComposeTestCheckFunc(
135135
testAccCheckSafetyRuleExists(ctx, resourceName),
136136
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
@@ -139,8 +139,8 @@ func testAccSafetyRule_tags(t *testing.T) {
139139
resource.TestCheckResourceAttr(resourceName, "target_controls.#", "1"),
140140
resource.TestCheckResourceAttr(resourceName, "gating_controls.#", "1"),
141141
resource.TestCheckResourceAttrPair(resourceName, "control_panel_arn", "aws_route53recoverycontrolconfig_control_panel.test", names.AttrARN),
142-
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
143-
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"),
142+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"),
143+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1),
144144
),
145145
},
146146
{
@@ -149,7 +149,7 @@ func testAccSafetyRule_tags(t *testing.T) {
149149
ImportStateVerify: true,
150150
},
151151
{
152-
Config: testAccSafetyRuleConfig_routingControl_tags2(rName, "key1", "value1updated", "key2", "value2"),
152+
Config: testAccSafetyRuleConfig_routingControl_tags2(rName, acctest.CtKey1, acctest.CtValue1Updated, acctest.CtKey2, acctest.CtValue2),
153153
Check: resource.ComposeTestCheckFunc(
154154
testAccCheckSafetyRuleExists(ctx, resourceName),
155155
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
@@ -158,13 +158,13 @@ func testAccSafetyRule_tags(t *testing.T) {
158158
resource.TestCheckResourceAttr(resourceName, "target_controls.#", "1"),
159159
resource.TestCheckResourceAttr(resourceName, "gating_controls.#", "1"),
160160
resource.TestCheckResourceAttrPair(resourceName, "control_panel_arn", "aws_route53recoverycontrolconfig_control_panel.test", names.AttrARN),
161-
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
162-
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"),
163-
resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"),
161+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"),
162+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated),
163+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2),
164164
),
165165
},
166166
{
167-
Config: testAccSafetyRuleConfig_routingControl_tags1(rName, "key2", "value2"),
167+
Config: testAccSafetyRuleConfig_routingControl_tags1(rName, acctest.CtKey2, acctest.CtValue1Updated),
168168
Check: resource.ComposeTestCheckFunc(
169169
testAccCheckSafetyRuleExists(ctx, resourceName),
170170
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
@@ -173,8 +173,8 @@ func testAccSafetyRule_tags(t *testing.T) {
173173
resource.TestCheckResourceAttr(resourceName, "target_controls.#", "1"),
174174
resource.TestCheckResourceAttr(resourceName, "gating_controls.#", "1"),
175175
resource.TestCheckResourceAttrPair(resourceName, "control_panel_arn", "aws_route53recoverycontrolconfig_control_panel.test", names.AttrARN),
176-
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
177-
resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"),
176+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"),
177+
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2),
178178
),
179179
},
180180
},
@@ -303,7 +303,7 @@ resource "aws_route53recoverycontrolconfig_routing_control" "test" {
303303
cluster_arn = aws_route53recoverycontrolconfig_cluster.test.arn
304304
control_panel_arn = aws_route53recoverycontrolconfig_control_panel.test.arn
305305
}
306-
306+
307307
resource "aws_route53recoverycontrolconfig_safety_rule" "test" {
308308
name = %[1]q
309309
control_panel_arn = aws_route53recoverycontrolconfig_control_panel.test.arn
@@ -316,7 +316,7 @@ resource "aws_route53recoverycontrolconfig_safety_rule" "test" {
316316
threshold = 0
317317
type = "AND"
318318
}
319-
tags = {
319+
tags = {
320320
%[2]q = %[3]q
321321
}
322322
}
@@ -352,9 +352,9 @@ resource "aws_route53recoverycontrolconfig_safety_rule" "test" {
352352
threshold = 0
353353
type = "AND"
354354
}
355-
tags = {
355+
tags = {
356356
%[2]q = %[3]q
357-
%[4]q = %[5]q
357+
%[4]q = %[5]q
358358
}
359359
}
360360
`, rName, tagKey1, tagValue1, tagKey2, tagValue2)

0 commit comments

Comments
 (0)