From 89b61ba239a3bbc5a9473c0dd5a6bd59f69b12b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 17 Mar 2023 14:58:43 -0400 Subject: [PATCH 1/3] r/aws_opsworks_application: Don't return an error on successful Delete. Acceptance test output: % make testacc TESTARGS='-run=TestAccOpsWorksApplication_basic' PKG=opsworks ACCTEST_PARALLELISM=2 ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/opsworks/... -v -count 1 -parallel 2 -run=TestAccOpsWorksApplication_basic -timeout 180m === RUN TestAccOpsWorksApplication_basic === PAUSE TestAccOpsWorksApplication_basic === CONT TestAccOpsWorksApplication_basic --- PASS: TestAccOpsWorksApplication_basic (59.71s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/opsworks 67.638s --- internal/service/opsworks/application.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/service/opsworks/application.go b/internal/service/opsworks/application.go index 0c56814cc1a4..53e6f3e9a2d6 100644 --- a/internal/service/opsworks/application.go +++ b/internal/service/opsworks/application.go @@ -376,19 +376,20 @@ func resourceApplicationDelete(ctx context.Context, d *schema.ResourceData, meta var diags diag.Diagnostics conn := meta.(*conns.AWSClient).OpsWorksConn() - req := &opsworks.DeleteAppInput{ + log.Printf("[DEBUG] Deleting OpsWorks Application: %s", d.Id()) + _, err := conn.DeleteAppWithContext(ctx, &opsworks.DeleteAppInput{ AppId: aws.String(d.Id()), - } - - log.Printf("[DEBUG] Deleting OpsWorks application: %s", d.Id()) - - _, err := conn.DeleteAppWithContext(ctx, req) + }) if tfawserr.ErrCodeEquals(err, opsworks.ErrCodeResourceNotFoundException) { return diags } - return sdkdiag.AppendErrorf(diags, "deleting OpsWorks Application (%s): %s", d.Id(), err) + if err != nil { + return sdkdiag.AppendErrorf(diags, "deleting OpsWorks Application (%s): %s", d.Id(), err) + } + + return diags } func resourceFindEnvironmentVariable(key string, vs []*opsworks.EnvironmentVariable) *opsworks.EnvironmentVariable { From c90a3969543cb9834dca7eadaea5600199739a89 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 17 Mar 2023 15:01:52 -0400 Subject: [PATCH 2/3] r/aws_pinpoint_app: Don't return an error on successful Delete. Acceptance test output: % make testacc TESTARGS='-run=TestAccPinpointApp_basic' PKG=pinpoint ACCTEST_PARALLELISM=2 ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/pinpoint/... -v -count 1 -parallel 2 -run=TestAccPinpointApp_basic -timeout 180m === RUN TestAccPinpointApp_basic === PAUSE TestAccPinpointApp_basic === CONT TestAccPinpointApp_basic --- PASS: TestAccPinpointApp_basic (21.89s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/pinpoint 31.491s --- internal/service/pinpoint/app.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/service/pinpoint/app.go b/internal/service/pinpoint/app.go index 3ffcee815c74..b4b87eed9c70 100644 --- a/internal/service/pinpoint/app.go +++ b/internal/service/pinpoint/app.go @@ -309,7 +309,7 @@ func resourceAppDelete(ctx context.Context, d *schema.ResourceData, meta interfa var diags diag.Diagnostics conn := meta.(*conns.AWSClient).PinpointConn() - log.Printf("[DEBUG] Pinpoint Delete App: %s", d.Id()) + log.Printf("[DEBUG] Deleting Pinpoint Application: %s", d.Id()) _, err := conn.DeleteAppWithContext(ctx, &pinpoint.DeleteAppInput{ ApplicationId: aws.String(d.Id()), }) @@ -318,7 +318,11 @@ func resourceAppDelete(ctx context.Context, d *schema.ResourceData, meta interfa return diags } - return sdkdiag.AppendErrorf(diags, "deleting Pinpoint Application (%s): %s", d.Id(), err) + if err != nil { + return sdkdiag.AppendErrorf(diags, "deleting Pinpoint Application (%s): %s", d.Id(), err) + } + + return diags } func expandCampaignHook(configs []interface{}) *pinpoint.CampaignHook { From f9396dec052b47d937a867886483559802fb4bcd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 17 Mar 2023 15:08:52 -0400 Subject: [PATCH 3/3] Add CHANGELOG entry. --- .changelog/30101.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/30101.txt diff --git a/.changelog/30101.txt b/.changelog/30101.txt new file mode 100644 index 000000000000..ffc084936c10 --- /dev/null +++ b/.changelog/30101.txt @@ -0,0 +1,7 @@ +```release-note:bug +resource/aws_pinpoint_app: Don't return an error like `deleting Pinpoint Application (...): %!s()` after successful Delete +``` + +```release-note:bug +resource/aws_opsworks_application: Don't return an error like `deleting OpsWorks Application (...): %!s()` after successful Delete +``` \ No newline at end of file