fix(apigateway): race condition exists between stage and cfnaccount in specrestapi

[nwinans]

This PR is based off of #18011, which fixed a race condition between RestApi stages and CloudWatch roles. The mentioned PR fixed the issue for RestApi, but not SpecRestApi, which this PR aims to fix.

The fix was largely implemented in RestApiBase. Since SpecRestApi inherits the same RestApiBase as RestApi, all we need to do is swap the order of resource creation so that the CloudWatch role is created before the RestApi stage, and can be attached correctly.

This PR also updates the integration tests to reflect the new dependency RestApi stage has on RestApi account.

Fixes #18925

All Submissions:

• Have you followed the guidelines in our Contributing guide?

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

[gitpod-io]

[aws-cdk-automation]

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

[nwinans]

I think an exemption to the linter error should be granted for this package. The actual integration tests themselves don't need to be touched given the nature of the bug fix, but the relevant integration test snapshots have been updated to reflect the behavior of the API.

[TheRealAmazonKendra]

I think an exemption to the linter error should be granted for this package. The actual integration tests themselves don't need to be touched given the nature of the bug fix, but the relevant integration test snapshots have been updated to reflect the behavior of the API.

That't reasonable. Providing the exemption.

✅ Updated pull request passes all PRLinter validations. Dissmissing previous PRLinter review.

[TheRealAmazonKendra]

@Mergifyio update

[mergify]

update

✅ Branch has been successfully updated

[TheRealAmazonKendra]

Given the limited updates to the integ test output, it doesn't look like the tests were actually run. Please revert the output of the integ tests and then run yarn integ --update-on-failed and commit the output.

Pull request has been modified.

[mergify]

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

[aws-cdk-automation]

AWS CodeBuild CI Report

• CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
• Commit ID: 4e30681
• Result: SUCCEEDED
• Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

[mergify]

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).