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

resource/aws_appautoscaling_policy: retry on rate exceeded during read, update and delete #4594

Merged

bflad merged 1 commit into hashicorp:master from s-maj:GH-4285

May 21, 2018

Contributor

s-maj commented May 18, 2018 •

edited

Loading

Fixes #4285

Changes proposed in this pull request:

Adds RetryableError on read, update and delete. It was already on create but it wasn't' enough.

Output from acceptance testing:

make testacc TEST=./aws TESTARGS='-run=TestAccAWSAppautoScalingPolicy'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAWSAppautoScalingPolicy -timeout 120m
=== RUN   TestAccAWSAppautoScalingPolicy_basic
--- PASS: TestAccAWSAppautoScalingPolicy_basic (59.41s)
=== RUN   TestAccAWSAppautoScalingPolicy_nestedSchema
--- PASS: TestAccAWSAppautoScalingPolicy_nestedSchema (85.70s)
=== RUN   TestAccAWSAppautoScalingPolicy_spotFleetRequest
--- PASS: TestAccAWSAppautoScalingPolicy_spotFleetRequest (107.47s)
=== RUN   TestAccAWSAppautoScalingPolicy_dynamoDb
--- PASS: TestAccAWSAppautoScalingPolicy_dynamoDb (174.32s)
=== RUN   TestAccAWSAppautoScalingPolicy_multiplePoliciesSameName
--- PASS: TestAccAWSAppautoScalingPolicy_multiplePoliciesSameName (170.50s)
=== RUN   TestAccAWSAppautoScalingPolicy_multiplePoliciesSameResource
--- PASS: TestAccAWSAppautoScalingPolicy_multiplePoliciesSameResource (168.86s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	766.302s

ghost added the size/M label

s-maj changed the title ~~aws_appautoscaling_policy: retry on rate exceeded during read, update and delete~~ resource/aws_appautoscaling_policy: retry on rate exceeded during read, update and delete

bflad added enhancement service/applicationautoscaling labels

Contributor Author

s-maj commented May 21, 2018

Hi @bflad! Are you sure this PR should be classified as enhancement? Initial issue was classified as a bug and, to me at least, it's a buggy behavior :)

bflad reviewed

View reviewed changes

Contributor

bflad left a comment

This is a good start -- please see below and let us know if you have any questions.

aws/resource_aws_appautoscaling_policy.go Outdated

    
            @@ -286,9 +286,19 @@ func resourceAwsAppautoscalingPolicyCreate(d *schema.ResourceData, meta interfac
          
              func resourceAwsAppautoscalingPolicyRead(d *schema.ResourceData, meta interface{}) error {

              	p, err := getAwsAppautoscalingPolicy(d, meta)

Contributor

bflad May 21, 2018

The API call must be inside the resource.Retry() loops to actually retry, otherwise it will continuously just loop with the same error without actually calling the API.

aws/resource_aws_appautoscaling_policy.go Outdated

    
            @@ -286,9 +286,19 @@ func resourceAwsAppautoscalingPolicyCreate(d *schema.ResourceData, meta interfac
          
              func resourceAwsAppautoscalingPolicyRead(d *schema.ResourceData, meta interface{}) error {

              	p, err := getAwsAppautoscalingPolicy(d, meta)

              	err = resource.Retry(5*time.Minute, func() *resource.RetryError {

              		if err != nil {

              			if isAWSErr(err, "FailedResourceAccessException", "Rate exceeded") {

Contributor

bflad May 21, 2018

Nitpick: SDK provided constant available: applicationautoscaling.ErrCodeFailedResourceAccessException

aws/resource_aws_appautoscaling_policy.go Outdated

    
            @@ -321,6 +331,15 @@ func resourceAwsAppautoscalingPolicyUpdate(d *schema.ResourceData, meta interfac
          
              	log.Printf("[DEBUG] Application Autoscaling Update Scaling Policy: %#v", params)

              	_, err := conn.PutScalingPolicy(&params)

Contributor

bflad May 21, 2018

Same here, the API call must be inside the resource.Retry()

aws/resource_aws_appautoscaling_policy.go Outdated

    
            @@ -345,8 +364,18 @@ func resourceAwsAppautoscalingPolicyDelete(d *schema.ResourceData, meta interfac
          
              		ServiceNamespace:  aws.String(d.Get("service_namespace").(string)),

              	}

              	log.Printf("[DEBUG] Deleting Application AutoScaling Policy opts: %#v", params)

              	if _, err := conn.DeleteScalingPolicy(&params); err != nil {

              		return fmt.Errorf("Failed to delete autoscaling policy: %s", err)

              	_, err = conn.DeleteScalingPolicy(&params)

Contributor

bflad May 21, 2018

Same here, the API call must be inside the resource.Retry()


          Retry on Rate exceeded during read, update and delete

e930e2a

s-maj force-pushed the GH-4285 branch from c568857 to e930e2a Compare

May 21, 2018 21:40

ghost added the size/M label

Contributor Author

s-maj commented May 21, 2018

Thanks for the tips! I've updated PR.

bflad reviewed

View reviewed changes

aws/resource_aws_appautoscaling_policy.go

+              		var err error
+              		p, err = getAwsAppautoscalingPolicy(d, meta)
+              		if err != nil {
+              			if awsErr, ok := err.(awserr.Error); ok {

Contributor

bflad May 21, 2018

Sorry I was not clear earlier. We can still use the isAWSErr() helper here to keep the code cleaner -- I'll fix these on merge.

if isAWSErr(err, applicationautoscaling.ErrCodeFailedResourceAccessException, "") {

aws/resource_aws_appautoscaling_policy.go

+              					return resource.RetryableError(err)
+              				}
+              			}
+              		}

Contributor

bflad May 21, 2018

We should return resource.NonRetryableError(err) as the last statement inside the if err != nil conditional so its passed up to the returned error, otherwise the outside code will not see these. I'll fix these on merge.

bflad added this to the v1.20.0 milestone

bflad approved these changes

View reviewed changes

Contributor

bflad left a comment

Thanks for this! 🚀

6 tests passed (all tests)
=== RUN   TestAccAWSAppautoScalingPolicy_nestedSchema
--- PASS: TestAccAWSAppautoScalingPolicy_nestedSchema (11.13s)
=== RUN   TestAccAWSAppautoScalingPolicy_basic
--- PASS: TestAccAWSAppautoScalingPolicy_basic (33.12s)
=== RUN   TestAccAWSAppautoScalingPolicy_spotFleetRequest
--- PASS: TestAccAWSAppautoScalingPolicy_spotFleetRequest (59.25s)
=== RUN   TestAccAWSAppautoScalingPolicy_multiplePoliciesSameName
--- PASS: TestAccAWSAppautoScalingPolicy_multiplePoliciesSameName (114.54s)
=== RUN   TestAccAWSAppautoScalingPolicy_multiplePoliciesSameResource
--- PASS: TestAccAWSAppautoScalingPolicy_multiplePoliciesSameResource (120.25s)
=== RUN   TestAccAWSAppautoScalingPolicy_dynamoDb
--- PASS: TestAccAWSAppautoScalingPolicy_dynamoDb (254.36s)

bflad merged commit e930e2a into hashicorp:master

bflad added a commit that referenced this pull request


          Update CHANGELOG for #4594

1bbecb0

Contributor Author

s-maj commented May 21, 2018

Thanks a million!

s-maj deleted the GH-4285 branch

May 21, 2018 23:37

Contributor

bflad commented May 23, 2018

This has been released in version 1.20.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

ghost commented Apr 5, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

ghost locked and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancement size/M