Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 5 commits into from
Jun 13, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e020fc
r/aws_ssm_default_patch_baseline: Remove local 'ssmClient' interface.
ewbankkit Jun 13, 2023
6d4fcd6
Add CHANGELOG entry.
ewbankkit Jun 13, 2023
9f60322
'SSMConn' -> 'SSMClient'.
ewbankkit Jun 13, 2023
31d2140
Use 'errs.IsA'.
ewbankkit Jun 13, 2023
50f392a
Correct CHANGELOG entry file name.
ewbankkit Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/31928.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_ssm_default_patch_baseline: Fix `*conns.AWSClient is not ssm.ssmClient: missing method SSMClient` panic
```
42 changes: 20 additions & 22 deletions internal/service/ssm/default_patch_baseline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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{
Expand All @@ -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 {
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down
Loading