Merge pull request #31928 from hashicorp/b-aws_ssm_default_patch_baseline.crash

r/aws_ssm_default_patch_baseline: Fix `*conns.AWSClient is not ssm.ssmClient: missing method SSMClient` panic

Author: ewbankkit

.changelog/31928.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_ssm_default_patch_baseline: Fix `*conns.AWSClient is not ssm.ssmClient: missing method SSMClient` panic
+```

internal/service/ssm/default_patch_baseline.go

@@ -15,8 +15,10 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	"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/errs/sdkdiag"
 	tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -28,10 +30,6 @@ const (
 	patchBaselineIDRegexPattern = `pb-[0-9a-f]{17}`
 )
 
-type ssmClient interface {
-	SSMClient() *ssm.Client
-}
-
 // @SDKResource("aws_ssm_default_patch_baseline")
 func ResourceDefaultPatchBaseline() *schema.Resource {
 	return &schema.Resource{
@@ -44,7 +42,7 @@ func ResourceDefaultPatchBaseline() *schema.Resource {
 				id := d.Id()
 
 				if isPatchBaselineID(id) || isPatchBaselineARN(id) {
-					conn := meta.(ssmClient).SSMClient()
+					conn := meta.(*conns.AWSClient).SSMClient(ctx)
 
 					patchbaseline, err := findPatchBaselineByID(ctx, conn, id)
 					if err != nil {
@@ -169,7 +167,7 @@ const (
 )
 
 func resourceDefaultPatchBaselineCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
-	conn := meta.(ssmClient).SSMClient()
+	conn := meta.(*conns.AWSClient).SSMClient(ctx)
 
 	baselineID := d.Get("baseline_id").(string)
 
@@ -199,7 +197,7 @@ func resourceDefaultPatchBaselineCreate(ctx context.Context, d *schema.ResourceD
 }
 
 func resourceDefaultPatchBaselineRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
-	conn := meta.(ssmClient).SSMClient()
+	conn := meta.(*conns.AWSClient).SSMClient(ctx)
 
 	out, err := FindDefaultPatchBaseline(ctx, conn, types.OperatingSystem(d.Id()))
 	if !d.IsNewResource() && tfresource.NotFound(err) {
@@ -245,7 +243,7 @@ func ownerIsSelfFilter() types.PatchOrchestratorFilter { //nolint:unused // This
 }
 
 func resourceDefaultPatchBaselineDelete(ctx context.Context, d *schema.ResourceData, meta any) (diags diag.Diagnostics) {
-	return defaultPatchBaselineRestoreOSDefault(ctx, meta.(ssmClient).SSMClient(), types.OperatingSystem(d.Id()))
+	return defaultPatchBaselineRestoreOSDefault(ctx, meta.(*conns.AWSClient).SSMClient(ctx), types.OperatingSystem(d.Id()))
 }
 
 func defaultPatchBaselineRestoreOSDefault(ctx context.Context, conn *ssm.Client, os types.OperatingSystem) (diags diag.Diagnostics) {
@@ -280,15 +278,15 @@ func FindDefaultPatchBaseline(ctx context.Context, conn *ssm.Client, os types.Op
 		OperatingSystem: os,
 	}
 	out, err := conn.GetDefaultPatchBaseline(ctx, in)
-	if err != nil {
-		var nfe *types.DoesNotExistException
-		if errors.As(err, &nfe) {
-			return nil, &retry.NotFoundError{
-				LastError:   err,
-				LastRequest: in,
-			}
+
+	if errs.IsA[*types.DoesNotExistException](err) {
+		return nil, &retry.NotFoundError{
+			LastError:   err,
+			LastRequest: in,
 		}
+	}
 
+	if err != nil {
 		return nil, err
 	}
 
@@ -304,15 +302,15 @@ func findPatchBaselineByID(ctx context.Context, conn *ssm.Client, id string) (*s
 		BaselineId: aws.String(id),
 	}
 	out, err := conn.GetPatchBaseline(ctx, in)
-	if err != nil {
-		var nfe *types.DoesNotExistException
-		if errors.As(err, &nfe) {
-			return nil, &retry.NotFoundError{
-				LastError:   err,
-				LastRequest: in,
-			}
+
+	if errs.IsA[*types.DoesNotExistException](err) {
+		return nil, &retry.NotFoundError{
+			LastError:   err,
+			LastRequest: in,
 		}
+	}
 
+	if err != nil {
 		return nil, err
 	}