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_autoscaling_group: Add ignore_failed_scaling_activities argument #32914

Merged
merged 6 commits into from
Aug 9, 2023
Merged

r/aws_autoscaling_group: Add ignore_failed_scaling_activities argument #32914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d57aaac
r/aws_autoscaling_group: Add 'ignore_failed_scaling_activities' argum…
ewbankkit Aug 8, 2023
f46e14c
r/aws_autoscaling_group: Add state upgrader.
ewbankkit Aug 8, 2023
c830765
Correct CHANGELOG entry file name.
ewbankkit Aug 8, 2023
8924624
Add 'TestAccAutoScalingGroup_withScalingActivityErrorIncorrectInstanc…
ewbankkit Aug 8, 2023
e40f640
Fix spelling mistake.
ewbankkit Aug 8, 2023
f90ef73
Fix golangci-lint 'whitespace'.
ewbankkit Aug 8, 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/32914.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_autoscaling_group: Add `ignore_failed_scaling_activities` argument
```
60 changes: 38 additions & 22 deletions internal/service/autoscaling/group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package autoscaling

import ( // nosemgrep:ci.semgrep.aws.multiple-service-imports
"context"
"errors"
"fmt"
"log"
"regexp"
Expand All @@ -18,7 +19,6 @@ import ( // nosemgrep:ci.semgrep.aws.multiple-service-imports
"github.com/aws/aws-sdk-go/service/elbv2"
"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
"github.com/hashicorp/go-cty/cty"
multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
Expand Down Expand Up @@ -53,6 +53,15 @@ func ResourceGroup() *schema.Resource {
Delete: schema.DefaultTimeout(10 * time.Minute),
},

SchemaVersion: 1,
StateUpgraders: []schema.StateUpgrader{
{
Type: resourceGroupV0().CoreConfigSchema().ImpliedType(),
Upgrade: GroupStateUpgradeV0,
Version: 0,
},
},

Schema: map[string]*schema.Schema{
"arn": {
Type: schema.TypeString,
Expand Down Expand Up @@ -117,6 +126,11 @@ func ResourceGroup() *schema.Resource {
Optional: true,
Computed: true,
},
"ignore_failed_scaling_activities": {
Type: schema.TypeBool,
Optional: true,
Default: false,
},
"initial_lifecycle_hook": {
Type: schema.TypeSet,
Optional: true,
Expand Down Expand Up @@ -1032,7 +1046,7 @@ func resourceGroupCreate(ctx context.Context, d *schema.ResourceData, meta inter
return nil
}

if err := waitGroupCapacitySatisfied(ctx, conn, meta.(*conns.AWSClient).ELBConn(ctx), meta.(*conns.AWSClient).ELBV2Conn(ctx), d.Id(), f, startTime, timeout); err != nil {
if err := waitGroupCapacitySatisfied(ctx, conn, meta.(*conns.AWSClient).ELBConn(ctx), meta.(*conns.AWSClient).ELBV2Conn(ctx), d.Id(), f, startTime, d.Get("ignore_failed_scaling_activities").(bool), timeout); err != nil {
return sdkdiag.AppendErrorf(diags, "waiting for Auto Scaling Group (%s) capacity satisfied: %s", d.Id(), err)
}
}
Expand Down Expand Up @@ -1524,7 +1538,7 @@ func resourceGroupUpdate(ctx context.Context, d *schema.ResourceData, meta inter
return nil
}

if err := waitGroupCapacitySatisfied(ctx, conn, meta.(*conns.AWSClient).ELBConn(ctx), meta.(*conns.AWSClient).ELBV2Conn(ctx), d.Id(), f, startTime, timeout); err != nil {
if err := waitGroupCapacitySatisfied(ctx, conn, meta.(*conns.AWSClient).ELBConn(ctx), meta.(*conns.AWSClient).ELBV2Conn(ctx), d.Id(), f, startTime, d.Get("ignore_failed_scaling_activities").(bool), timeout); err != nil {
return sdkdiag.AppendErrorf(diags, "waiting for Auto Scaling Group (%s) capacity satisfied: %s", d.Id(), err)
}
}
Expand Down Expand Up @@ -2162,31 +2176,33 @@ func findWarmPool(ctx context.Context, conn *autoscaling.AutoScaling, name strin
return output, nil
}

func statusGroupCapacity(ctx context.Context, conn *autoscaling.AutoScaling, elbconn *elb.ELB, elbv2conn *elbv2.ELBV2, name string, startTime time.Time, cb func(int, int) error) retry.StateRefreshFunc {
func statusGroupCapacity(ctx context.Context, conn *autoscaling.AutoScaling, elbconn *elb.ELB, elbv2conn *elbv2.ELBV2, name string, cb func(int, int) error, startTime time.Time, ignoreFailedScalingActivities bool) retry.StateRefreshFunc {
return func() (interface{}, string, error) {
// Check for fatal error in activity logs.
scalingActivities, err := findScalingActivitiesByName(ctx, conn, name, startTime)
if !ignoreFailedScalingActivities {
// Check for fatal error in activity logs.
scalingActivities, err := findScalingActivitiesByName(ctx, conn, name, startTime)

if err != nil {
return nil, "", fmt.Errorf("reading scaling activities: %w", err)
}
if err != nil {
return nil, "", fmt.Errorf("reading scaling activities: %w", err)
}

var errors *multierror.Error
var errs []error

for _, v := range scalingActivities {
if statusCode := aws.StringValue(v.StatusCode); statusCode == autoscaling.ScalingActivityStatusCodeFailed && aws.Int64Value(v.Progress) == 100 {
if strings.Contains(aws.StringValue(v.StatusMessage), "Invalid IAM Instance Profile") {
// the activity will likely be retried
continue
for _, v := range scalingActivities {
if statusCode := aws.StringValue(v.StatusCode); statusCode == autoscaling.ScalingActivityStatusCodeFailed && aws.Int64Value(v.Progress) == 100 {
if strings.Contains(aws.StringValue(v.StatusMessage), "Invalid IAM Instance Profile") {
// the activity will likely be retried
continue
}
errs = append(errs, fmt.Errorf("scaling activity (%s): %s: %s", aws.StringValue(v.ActivityId), statusCode, aws.StringValue(v.StatusMessage)))
}
errors = multierror.Append(errors, fmt.Errorf("Scaling activity (%s): %s: %s", aws.StringValue(v.ActivityId), statusCode, aws.StringValue(v.StatusMessage)))
}
}

err = errors.ErrorOrNil()
err = errors.Join(errs...)

if err != nil {
return nil, "", err
if err != nil {
return nil, "", err
}
}

g, err := FindGroupByName(ctx, conn, name)
Expand Down Expand Up @@ -2415,10 +2431,10 @@ func statusWarmPoolInstanceCount(ctx context.Context, conn *autoscaling.AutoScal
}
}

func waitGroupCapacitySatisfied(ctx context.Context, conn *autoscaling.AutoScaling, elbconn *elb.ELB, elbv2conn *elbv2.ELBV2, name string, cb func(int, int) error, startTime time.Time, timeout time.Duration) error {
func waitGroupCapacitySatisfied(ctx context.Context, conn *autoscaling.AutoScaling, elbconn *elb.ELB, elbv2conn *elbv2.ELBV2, name string, cb func(int, int) error, startTime time.Time, ignoreFailedScalingActivities bool, timeout time.Duration) error {
stateConf := &retry.StateChangeConf{
Target: []string{"ok"},
Refresh: statusGroupCapacity(ctx, conn, elbconn, elbv2conn, name, startTime, cb),
Refresh: statusGroupCapacity(ctx, conn, elbconn, elbv2conn, name, cb, startTime, ignoreFailedScalingActivities),
Timeout: timeout,
}

Expand Down
Loading
Loading