Skip to content

Commit 39e03ea

Browse files
gdavisongdavison
committed
Adds context calls to cloudwatch 
1 parent 78add42 commit 39e03ea

12 files changed

+328
-279
lines changed

‎internal/service/cloudwatch/composite_alarm.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func resourceCompositeAlarmCreate(ctx context.Context, d *schema.ResourceData, m
126126
return diag.Errorf("error reading CloudWatch Composite Alarm (%s): %s", name, err)
127127
}
128128

129-
err = UpdateTags(conn, aws.StringValue(alarm.AlarmArn), nil, tags)
129+
err = UpdateTags(ctx, conn, aws.StringValue(alarm.AlarmArn), nil, tags)
130130

131131
// If default tags only, log and continue. Otherwise, error.
132132
if v, ok := d.GetOk("tags"); (!ok || len(v.(map[string]interface{})) == 0) && verify.ErrorISOUnsupported(conn.PartitionID, err) {
@@ -188,7 +188,7 @@ func resourceCompositeAlarmRead(ctx context.Context, d *schema.ResourceData, met
188188
return diag.Errorf("error setting ok_actions: %s", err)
189189
}
190190

191-
tags, err := ListTags(conn, aws.StringValue(alarm.AlarmArn))
191+
tags, err := ListTags(ctx, conn, aws.StringValue(alarm.AlarmArn))
192192

193193
// Some partitions (i.e., ISO) may not support tagging, giving error
194194
if verify.ErrorISOUnsupported(conn.PartitionID, err) {
@@ -229,7 +229,7 @@ func resourceCompositeAlarmUpdate(ctx context.Context, d *schema.ResourceData, m
229229
if d.HasChange("tags_all") {
230230
o, n := d.GetChange("tags_all")
231231

232-
err := UpdateTags(conn, arn, o, n)
232+
err := UpdateTags(ctx, conn, arn, o, n)
233233

234234
// Some partitions (i.e., ISO) may not support tagging, giving error
235235
if verify.ErrorISOUnsupported(conn.PartitionID, err) {

‎internal/service/cloudwatch/composite_alarm_test.go

+58-47
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@ import (
1717
)
1818

1919
func TestAccCloudWatchCompositeAlarm_basic(t *testing.T) {
20+
ctx := acctest.Context(t)
2021
suffix := sdkacctest.RandString(8)
2122
resourceName := "aws_cloudwatch_composite_alarm.test"
2223

2324
resource.ParallelTest(t, resource.TestCase{
2425
PreCheck: func() { acctest.PreCheck(t) },
2526
ErrorCheck: acctest.ErrorCheck(t, cloudwatch.EndpointsID),
2627
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
27-
CheckDestroy: testAccCheckCompositeAlarmDestroy,
28+
CheckDestroy: testAccCheckCompositeAlarmDestroy(ctx),
2829
Steps: []resource.TestStep{
2930
{
3031
Config: testAccCompositeAlarmConfig_basic(suffix),
3132
Check: resource.ComposeTestCheckFunc(
32-
testAccCheckCompositeAlarmExists(resourceName),
33+
testAccCheckCompositeAlarmExists(ctx, resourceName),
3334
resource.TestCheckResourceAttr(resourceName, "actions_enabled", "true"),
3435
resource.TestCheckResourceAttr(resourceName, "alarm_actions.#", "0"),
3536
resource.TestCheckResourceAttr(resourceName, "alarm_description", ""),
@@ -51,19 +52,20 @@ func TestAccCloudWatchCompositeAlarm_basic(t *testing.T) {
5152
}
5253

5354
func TestAccCloudWatchCompositeAlarm_disappears(t *testing.T) {
55+
ctx := acctest.Context(t)
5456
suffix := sdkacctest.RandString(8)
5557
resourceName := "aws_cloudwatch_composite_alarm.test"
5658

5759
resource.ParallelTest(t, resource.TestCase{
5860
PreCheck: func() { acctest.PreCheck(t) },
5961
ErrorCheck: acctest.ErrorCheck(t, cloudwatch.EndpointsID),
6062
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
61-
CheckDestroy: testAccCheckCompositeAlarmDestroy,
63+
CheckDestroy: testAccCheckCompositeAlarmDestroy(ctx),
6264
Steps: []resource.TestStep{
6365
{
6466
Config: testAccCompositeAlarmConfig_basic(suffix),
6567
Check: resource.ComposeTestCheckFunc(
66-
testAccCheckCompositeAlarmExists(resourceName),
68+
testAccCheckCompositeAlarmExists(ctx, resourceName),
6769
acctest.CheckResourceDisappears(acctest.Provider, tfcloudwatch.ResourceCompositeAlarm(), resourceName),
6870
),
6971
ExpectNonEmptyPlan: true,
@@ -73,19 +75,20 @@ func TestAccCloudWatchCompositeAlarm_disappears(t *testing.T) {
7375
}
7476

7577
func TestAccCloudWatchCompositeAlarm_actionsEnabled(t *testing.T) {
78+
ctx := acctest.Context(t)
7679
suffix := sdkacctest.RandString(8)
7780
resourceName := "aws_cloudwatch_composite_alarm.test"
7881

7982
resource.ParallelTest(t, resource.TestCase{
8083
PreCheck: func() { acctest.PreCheck(t) },
8184
ErrorCheck: acctest.ErrorCheck(t, cloudwatch.EndpointsID),
8285
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
83-
CheckDestroy: testAccCheckCompositeAlarmDestroy,
86+
CheckDestroy: testAccCheckCompositeAlarmDestroy(ctx),
8487
Steps: []resource.TestStep{
8588
{
8689
Config: testAccCompositeAlarmConfig_actionsEnabled(false, suffix),
8790
Check: resource.ComposeTestCheckFunc(
88-
testAccCheckCompositeAlarmExists(resourceName),
91+
testAccCheckCompositeAlarmExists(ctx, resourceName),
8992
resource.TestCheckResourceAttr(resourceName, "actions_enabled", "false"),
9093
),
9194
},
@@ -97,7 +100,7 @@ func TestAccCloudWatchCompositeAlarm_actionsEnabled(t *testing.T) {
97100
{
98101
Config: testAccCompositeAlarmConfig_actionsEnabled(true, suffix),
99102
Check: resource.ComposeTestCheckFunc(
100-
testAccCheckCompositeAlarmExists(resourceName),
103+
testAccCheckCompositeAlarmExists(ctx, resourceName),
101104
resource.TestCheckResourceAttr(resourceName, "actions_enabled", "true"),
102105
),
103106
},
@@ -111,19 +114,20 @@ func TestAccCloudWatchCompositeAlarm_actionsEnabled(t *testing.T) {
111114
}
112115

113116
func TestAccCloudWatchCompositeAlarm_alarmActions(t *testing.T) {
117+
ctx := acctest.Context(t)
114118
suffix := sdkacctest.RandString(8)
115119
resourceName := "aws_cloudwatch_composite_alarm.test"
116120

117121
resource.ParallelTest(t, resource.TestCase{
118122
PreCheck: func() { acctest.PreCheck(t) },
119123
ErrorCheck: acctest.ErrorCheck(t, cloudwatch.EndpointsID),
120124
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
121-
CheckDestroy: testAccCheckCompositeAlarmDestroy,
125+
CheckDestroy: testAccCheckCompositeAlarmDestroy(ctx),
122126
Steps: []resource.TestStep{
123127
{
124128
Config: testAccCompositeAlarmConfig_actions(suffix),
125129
Check: resource.ComposeTestCheckFunc(
126-
testAccCheckCompositeAlarmExists(resourceName),
130+
testAccCheckCompositeAlarmExists(ctx, resourceName),
127131
resource.TestCheckResourceAttr(resourceName, "alarm_actions.#", "2"),
128132
),
129133
},
@@ -135,7 +139,7 @@ func TestAccCloudWatchCompositeAlarm_alarmActions(t *testing.T) {
135139
{
136140
Config: testAccCompositeAlarmConfig_updateActions(suffix),
137141
Check: resource.ComposeTestCheckFunc(
138-
testAccCheckCompositeAlarmExists(resourceName),
142+
testAccCheckCompositeAlarmExists(ctx, resourceName),
139143
resource.TestCheckResourceAttr(resourceName, "alarm_actions.#", "1"),
140144
),
141145
},
@@ -147,7 +151,7 @@ func TestAccCloudWatchCompositeAlarm_alarmActions(t *testing.T) {
147151
{
148152
Config: testAccCompositeAlarmConfig_basic(suffix),
149153
Check: resource.ComposeTestCheckFunc(
150-
testAccCheckCompositeAlarmExists(resourceName),
154+
testAccCheckCompositeAlarmExists(ctx, resourceName),
151155
resource.TestCheckResourceAttr(resourceName, "alarm_actions.#", "0"),
152156
),
153157
},
@@ -161,19 +165,20 @@ func TestAccCloudWatchCompositeAlarm_alarmActions(t *testing.T) {
161165
}
162166

163167
func TestAccCloudWatchCompositeAlarm_description(t *testing.T) {
168+
ctx := acctest.Context(t)
164169
suffix := sdkacctest.RandString(8)
165170
resourceName := "aws_cloudwatch_composite_alarm.test"
166171

167172
resource.ParallelTest(t, resource.TestCase{
168173
PreCheck: func() { acctest.PreCheck(t) },
169174
ErrorCheck: acctest.ErrorCheck(t, cloudwatch.EndpointsID),
170175
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
171-
CheckDestroy: testAccCheckCompositeAlarmDestroy,
176+
CheckDestroy: testAccCheckCompositeAlarmDestroy(ctx),
172177
Steps: []resource.TestStep{
173178
{
174179
Config: testAccCompositeAlarmConfig_description("Test 1", suffix),
175180
Check: resource.ComposeTestCheckFunc(
176-
testAccCheckCompositeAlarmExists(resourceName),
181+
testAccCheckCompositeAlarmExists(ctx, resourceName),
177182
resource.TestCheckResourceAttr(resourceName, "alarm_description", "Test 1"),
178183
),
179184
},
@@ -185,7 +190,7 @@ func TestAccCloudWatchCompositeAlarm_description(t *testing.T) {
185190
{
186191
Config: testAccCompositeAlarmConfig_description("Test Updated", suffix),
187192
Check: resource.ComposeTestCheckFunc(
188-
testAccCheckCompositeAlarmExists(resourceName),
193+
testAccCheckCompositeAlarmExists(ctx, resourceName),
189194
resource.TestCheckResourceAttr(resourceName, "alarm_description", "Test Updated"),
190195
),
191196
},
@@ -199,19 +204,20 @@ func TestAccCloudWatchCompositeAlarm_description(t *testing.T) {
199204
}
200205

201206
func TestAccCloudWatchCompositeAlarm_insufficientDataActions(t *testing.T) {
207+
ctx := acctest.Context(t)
202208
suffix := sdkacctest.RandString(8)
203209
resourceName := "aws_cloudwatch_composite_alarm.test"
204210

205211
resource.ParallelTest(t, resource.TestCase{
206212
PreCheck: func() { acctest.PreCheck(t) },
207213
ErrorCheck: acctest.ErrorCheck(t, cloudwatch.EndpointsID),
208214
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
209-
CheckDestroy: testAccCheckCompositeAlarmDestroy,
215+
CheckDestroy: testAccCheckCompositeAlarmDestroy(ctx),
210216
Steps: []resource.TestStep{
211217
{
212218
Config: testAccCompositeAlarmConfig_insufficientDataActions(suffix),
213219
Check: resource.ComposeTestCheckFunc(
214-
testAccCheckCompositeAlarmExists(resourceName),
220+
testAccCheckCompositeAlarmExists(ctx, resourceName),
215221
resource.TestCheckResourceAttr(resourceName, "insufficient_data_actions.#", "2"),
216222
),
217223
},
@@ -223,7 +229,7 @@ func TestAccCloudWatchCompositeAlarm_insufficientDataActions(t *testing.T) {
223229
{
224230
Config: testAccCompositeAlarmConfig_updateInsufficientDataActions(suffix),
225231
Check: resource.ComposeTestCheckFunc(
226-
testAccCheckCompositeAlarmExists(resourceName),
232+
testAccCheckCompositeAlarmExists(ctx, resourceName),
227233
resource.TestCheckResourceAttr(resourceName, "insufficient_data_actions.#", "1"),
228234
),
229235
},
@@ -235,7 +241,7 @@ func TestAccCloudWatchCompositeAlarm_insufficientDataActions(t *testing.T) {
235241
{
236242
Config: testAccCompositeAlarmConfig_basic(suffix),
237243
Check: resource.ComposeTestCheckFunc(
238-
testAccCheckCompositeAlarmExists(resourceName),
244+
testAccCheckCompositeAlarmExists(ctx, resourceName),
239245
resource.TestCheckResourceAttr(resourceName, "insufficient_data_actions.#", "0"),
240246
),
241247
},
@@ -249,19 +255,20 @@ func TestAccCloudWatchCompositeAlarm_insufficientDataActions(t *testing.T) {
249255
}
250256

251257
func TestAccCloudWatchCompositeAlarm_okActions(t *testing.T) {
258+
ctx := acctest.Context(t)
252259
suffix := sdkacctest.RandString(8)
253260
resourceName := "aws_cloudwatch_composite_alarm.test"
254261

255262
resource.ParallelTest(t, resource.TestCase{
256263
PreCheck: func() { acctest.PreCheck(t) },
257264
ErrorCheck: acctest.ErrorCheck(t, cloudwatch.EndpointsID),
258265
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
259-
CheckDestroy: testAccCheckCompositeAlarmDestroy,
266+
CheckDestroy: testAccCheckCompositeAlarmDestroy(ctx),
260267
Steps: []resource.TestStep{
261268
{
262269
Config: testAccCompositeAlarmConfig_okActions(suffix),
263270
Check: resource.ComposeTestCheckFunc(
264-
testAccCheckCompositeAlarmExists(resourceName),
271+
testAccCheckCompositeAlarmExists(ctx, resourceName),
265272
resource.TestCheckResourceAttr(resourceName, "ok_actions.#", "2"),
266273
),
267274
},
@@ -273,7 +280,7 @@ func TestAccCloudWatchCompositeAlarm_okActions(t *testing.T) {
273280
{
274281
Config: testAccCompositeAlarmConfig_updateOkActions(suffix),
275282
Check: resource.ComposeTestCheckFunc(
276-
testAccCheckCompositeAlarmExists(resourceName),
283+
testAccCheckCompositeAlarmExists(ctx, resourceName),
277284
resource.TestCheckResourceAttr(resourceName, "ok_actions.#", "1"),
278285
),
279286
},
@@ -285,7 +292,7 @@ func TestAccCloudWatchCompositeAlarm_okActions(t *testing.T) {
285292
{
286293
Config: testAccCompositeAlarmConfig_basic(suffix),
287294
Check: resource.ComposeTestCheckFunc(
288-
testAccCheckCompositeAlarmExists(resourceName),
295+
testAccCheckCompositeAlarmExists(ctx, resourceName),
289296
resource.TestCheckResourceAttr(resourceName, "ok_actions.#", "0"),
290297
),
291298
},
@@ -299,19 +306,20 @@ func TestAccCloudWatchCompositeAlarm_okActions(t *testing.T) {
299306
}
300307

301308
func TestAccCloudWatchCompositeAlarm_allActions(t *testing.T) {
309+
ctx := acctest.Context(t)
302310
suffix := sdkacctest.RandString(8)
303311
resourceName := "aws_cloudwatch_composite_alarm.test"
304312

305313
resource.ParallelTest(t, resource.TestCase{
306314
PreCheck: func() { acctest.PreCheck(t) },
307315
ErrorCheck: acctest.ErrorCheck(t, cloudwatch.EndpointsID),
308316
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
309-
CheckDestroy: testAccCheckCompositeAlarmDestroy,
317+
CheckDestroy: testAccCheckCompositeAlarmDestroy(ctx),
310318
Steps: []resource.TestStep{
311319
{
312320
Config: testAccCompositeAlarmConfig_allActions(suffix),
313321
Check: resource.ComposeTestCheckFunc(
314-
testAccCheckCompositeAlarmExists(resourceName),
322+
testAccCheckCompositeAlarmExists(ctx, resourceName),
315323
resource.TestCheckResourceAttr(resourceName, "alarm_actions.#", "1"),
316324
resource.TestCheckResourceAttr(resourceName, "insufficient_data_actions.#", "1"),
317325
resource.TestCheckResourceAttr(resourceName, "ok_actions.#", "1"),
@@ -325,7 +333,7 @@ func TestAccCloudWatchCompositeAlarm_allActions(t *testing.T) {
325333
{
326334
Config: testAccCompositeAlarmConfig_basic(suffix),
327335
Check: resource.ComposeTestCheckFunc(
328-
testAccCheckCompositeAlarmExists(resourceName),
336+
testAccCheckCompositeAlarmExists(ctx, resourceName),
329337
resource.TestCheckResourceAttr(resourceName, "alarm_actions.#", "0"),
330338
resource.TestCheckResourceAttr(resourceName, "insufficient_data_actions.#", "0"),
331339
resource.TestCheckResourceAttr(resourceName, "ok_actions.#", "0"),
@@ -341,19 +349,20 @@ func TestAccCloudWatchCompositeAlarm_allActions(t *testing.T) {
341349
}
342350

343351
func TestAccCloudWatchCompositeAlarm_updateAlarmRule(t *testing.T) {
352+
ctx := acctest.Context(t)
344353
suffix := sdkacctest.RandString(8)
345354
resourceName := "aws_cloudwatch_composite_alarm.test"
346355

347356
resource.ParallelTest(t, resource.TestCase{
348357
PreCheck: func() { acctest.PreCheck(t) },
349358
ErrorCheck: acctest.ErrorCheck(t, cloudwatch.EndpointsID),
350359
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
351-
CheckDestroy: testAccCheckCompositeAlarmDestroy,
360+
CheckDestroy: testAccCheckCompositeAlarmDestroy(ctx),
352361
Steps: []resource.TestStep{
353362
{
354363
Config: testAccCompositeAlarmConfig_basic(suffix),
355364
Check: resource.ComposeTestCheckFunc(
356-
testAccCheckCompositeAlarmExists(resourceName),
365+
testAccCheckCompositeAlarmExists(ctx, resourceName),
357366
),
358367
},
359368
{
@@ -364,7 +373,7 @@ func TestAccCloudWatchCompositeAlarm_updateAlarmRule(t *testing.T) {
364373
{
365374
Config: testAccCompositeAlarmConfig_updateRule(suffix),
366375
Check: resource.ComposeTestCheckFunc(
367-
testAccCheckCompositeAlarmExists(resourceName),
376+
testAccCheckCompositeAlarmExists(ctx, resourceName),
368377
resource.TestCheckResourceAttr(resourceName, "alarm_rule", fmt.Sprintf("ALARM(tf-test-metric-0-%[1]s)", suffix)),
369378
),
370379
},
@@ -377,32 +386,34 @@ func TestAccCloudWatchCompositeAlarm_updateAlarmRule(t *testing.T) {
377386
})
378387
}
379388

380-
func testAccCheckCompositeAlarmDestroy(s *terraform.State) error {
381-
conn := acctest.Provider.Meta().(*conns.AWSClient).CloudWatchConn()
389+
func testAccCheckCompositeAlarmDestroy(ctx context.Context) resource.TestCheckFunc {
390+
return func(s *terraform.State) error {
391+
conn := acctest.Provider.Meta().(*conns.AWSClient).CloudWatchConn()
382392

383-
for _, rs := range s.RootModule().Resources {
384-
if rs.Type != "aws_cloudwatch_composite_alarm" {
385-
continue
386-
}
393+
for _, rs := range s.RootModule().Resources {
394+
if rs.Type != "aws_cloudwatch_composite_alarm" {
395+
continue
396+
}
387397

388-
alarm, err := tfcloudwatch.FindCompositeAlarmByName(context.Background(), conn, rs.Primary.ID)
398+
alarm, err := tfcloudwatch.FindCompositeAlarmByName(ctx, conn, rs.Primary.ID)
389399

390-
if tfawserr.ErrCodeEquals(err, cloudwatch.ErrCodeResourceNotFound) {
391-
continue
392-
}
393-
if err != nil {
394-
return fmt.Errorf("error reading CloudWatch composite alarm (%s): %w", rs.Primary.ID, err)
395-
}
400+
if tfawserr.ErrCodeEquals(err, cloudwatch.ErrCodeResourceNotFound) {
401+
continue
402+
}
403+
if err != nil {
404+
return fmt.Errorf("error reading CloudWatch composite alarm (%s): %w", rs.Primary.ID, err)
405+
}
396406

397-
if alarm != nil {
398-
return fmt.Errorf("CloudWatch composite alarm (%s) still exists", rs.Primary.ID)
407+
if alarm != nil {
408+
return fmt.Errorf("CloudWatch composite alarm (%s) still exists", rs.Primary.ID)
409+
}
399410
}
400-
}
401411

402-
return nil
412+
return nil
413+
}
403414
}
404415

405-
func testAccCheckCompositeAlarmExists(resourceName string) resource.TestCheckFunc {
416+
func testAccCheckCompositeAlarmExists(ctx context.Context, resourceName string) resource.TestCheckFunc {
406417
return func(s *terraform.State) error {
407418
rs, ok := s.RootModule().Resources[resourceName]
408419
if !ok {
@@ -415,7 +426,7 @@ func testAccCheckCompositeAlarmExists(resourceName string) resource.TestCheckFun
415426

416427
conn := acctest.Provider.Meta().(*conns.AWSClient).CloudWatchConn()
417428

418-
alarm, err := tfcloudwatch.FindCompositeAlarmByName(context.Background(), conn, rs.Primary.ID)
429+
alarm, err := tfcloudwatch.FindCompositeAlarmByName(ctx, conn, rs.Primary.ID)
419430

420431
if err != nil {
421432
return fmt.Errorf("error reading CloudWatch composite alarm (%s): %w", rs.Primary.ID, err)

0 commit comments

Comments
 (0)