From d3c3e479ba8722742dca85190293fb535441e74a Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Fri, 9 Feb 2024 10:34:51 -0600 Subject: [PATCH] aws_medialive_channel: check NotFound during delete --- internal/service/medialive/channel.go | 28 +++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/internal/service/medialive/channel.go b/internal/service/medialive/channel.go index 3beba705f14..b14f813541d 100644 --- a/internal/service/medialive/channel.go +++ b/internal/service/medialive/channel.go @@ -21,6 +21,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -958,6 +959,10 @@ func resourceChannelDelete(ctx context.Context, d *schema.ResourceData, meta int channel, err := FindChannelByID(ctx, conn, d.Id()) + if tfresource.NotFound(err) { + return diags + } + if err != nil { return create.AppendDiagError(diags, names.MediaLive, create.ErrActionDeleting, ResNameChannel, d.Id(), err) } @@ -972,12 +977,11 @@ func resourceChannelDelete(ctx context.Context, d *schema.ResourceData, meta int ChannelId: aws.String(d.Id()), }) - if err != nil { - var nfe *types.NotFoundException - if errors.As(err, &nfe) { - return diags - } + if errs.IsA[*types.NotFoundException](err) { + return diags + } + if err != nil { return create.AppendDiagError(diags, names.MediaLive, create.ErrActionDeleting, ResNameChannel, d.Id(), err) } @@ -1128,15 +1132,15 @@ func FindChannelByID(ctx context.Context, conn *medialive.Client, id string) (*m ChannelId: aws.String(id), } out, err := conn.DescribeChannel(ctx, in) - if err != nil { - var nfe *types.NotFoundException - if errors.As(err, &nfe) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, - } + + if errs.IsA[*types.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: in, } + } + if err != nil { return nil, err }