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

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

Merged
merged 5 commits into from Oct 28, 2022
Merged

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

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
dc60bc9
fix(apigateway): racecondition between stage and cfnaccount in specre…
Oct 27, 2022
d5e982a
Merge branch 'main' into main
mergify[bot] Oct 27, 2022
5a459eb
fix integration tests
Oct 28, 2022
23f9797
Merge branch 'main' into main
nwinans Oct 28, 2022
4e30681
Merge branch 'main' into main
mergify[bot] Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/@aws-cdk/aws-apigateway/lib/restapi.ts
View file
Open in desktop
Expand Up @@ -662,16 +662,16 @@ export class SpecRestApi extends RestApiBase {
this.restApiRootResourceId = resource.attrRootResourceId;
this.root = new RootResource(this, {}, this.restApiRootResourceId);

this._configureDeployment(props);
if (props.domainName) {
this.addDomainName('CustomDomain', props.domainName);
}

const cloudWatchRoleDefault = FeatureFlags.of(this).isEnabled(APIGATEWAY_DISABLE_CLOUDWATCH_ROLE) ? false : true;
const cloudWatchRole = props.cloudWatchRole ?? cloudWatchRoleDefault;
if (cloudWatchRole) {
this._configureCloudWatchRole(resource);
}

this._configureDeployment(props);
if (props.domainName) {
this.addDomainName('CustomDomain', props.domainName);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/test/api-definition.asset.integ.snapshot/cdk.out
View file
Open in desktop
@@ -1 +1 @@
{"version":"20.0.0"}
{"version":"21.0.0"}
5 changes: 3 additions & 2 deletions packages/@aws-cdk/aws-apigateway/test/api-definition.asset.integ.snapshot/integ.json
View file
Open in desktop
@@ -1,11 +1,12 @@
{
"version": "20.0.0",
"version": "21.0.0",
"testCases": {
"restapi-fromdefinition/DefaultTest": {
"stacks": [
"integtest-restapi-fromdefinition-asset"
],
"assertionStack": "restapi-fromdefinition/DefaultTest/DeployAssert"
"assertionStack": "restapi-fromdefinition/DefaultTest/DeployAssert",
"assertionStackName": "restapifromdefinitionDefaultTestDeployAssertDF3B0845"
}
}
}
6 changes: 3 additions & 3 deletions ...st/api-definition.asset.integ.snapshot/integtest-restapi-fromdefinition-asset.assets.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"version": "20.0.0",
"version": "21.0.0",
"files": {
"68497ac876de4e963fc8f7b5f1b28844c18ecc95e3f7c6e9e0bf250e03c037fb": {
"source": {
Expand All @@ -14,15 +14,15 @@
}
}
},
"b6f4053913c5258c89b2cb1e8d48d0a04346c7b0736f15235a74f8fd890de556": {
"2fcb710210eb75f31b39dd1787cc4271df763ad6b541a188cb417095e1b83aa7": {
"source": {
"path": "integtest-restapi-fromdefinition-asset.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "b6f4053913c5258c89b2cb1e8d48d0a04346c7b0736f15235a74f8fd890de556.json",
"objectKey": "2fcb710210eb75f31b39dd1787cc4271df763ad6b541a188cb417095e1b83aa7.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
53 changes: 28 additions & 25 deletions .../api-definition.asset.integ.snapshot/integtest-restapi-fromdefinition-asset.template.json
View file
Open in desktop
Expand Up @@ -57,31 +57,6 @@
]
}
},
"myapiDeployment92F2CB49d7e5c9cfe50a1616e1cef4517d6b8f96": {
"Type": "AWS::ApiGateway::Deployment",
"Properties": {
"RestApiId": {
"Ref": "myapi4C7BF186"
},
"Description": "Automatically created by the RestApi construct"
},
"DependsOn": [
"myapibooksGETD6B2F597",
"myapibooks51D54548"
]
},
"myapiDeploymentStageprod298F01AF": {
"Type": "AWS::ApiGateway::Stage",
"Properties": {
"RestApiId": {
"Ref": "myapi4C7BF186"
},
"DeploymentId": {
"Ref": "myapiDeployment92F2CB49d7e5c9cfe50a1616e1cef4517d6b8f96"
},
"StageName": "prod"
}
},
"myapiCloudWatchRole095452E5": {
"Type": "AWS::IAM::Role",
"Properties": {
Expand Down Expand Up @@ -130,6 +105,34 @@
],
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
},
"myapiDeployment92F2CB49d7e5c9cfe50a1616e1cef4517d6b8f96": {
"Type": "AWS::ApiGateway::Deployment",
"Properties": {
"RestApiId": {
"Ref": "myapi4C7BF186"
},
"Description": "Automatically created by the RestApi construct"
},
"DependsOn": [
"myapibooksGETD6B2F597",
"myapibooks51D54548"
]
},
"myapiDeploymentStageprod298F01AF": {
"Type": "AWS::ApiGateway::Stage",
"Properties": {
"RestApiId": {
"Ref": "myapi4C7BF186"
},
"DeploymentId": {
"Ref": "myapiDeployment92F2CB49d7e5c9cfe50a1616e1cef4517d6b8f96"
},
"StageName": "prod"
},
"DependsOn": [
"myapiAccountEC421A0A"
]
}
},
"Outputs": {
Expand Down
33 changes: 12 additions & 21 deletions packages/@aws-cdk/aws-apigateway/test/api-definition.asset.integ.snapshot/manifest.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"version": "20.0.0",
"version": "21.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
Expand All @@ -23,7 +23,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b6f4053913c5258c89b2cb1e8d48d0a04346c7b0736f15235a74f8fd890de556.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/2fcb710210eb75f31b39dd1787cc4271df763ad6b541a188cb417095e1b83aa7.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -57,34 +57,34 @@
"data": "myapibooksGETD6B2F597"
}
],
"/integtest-restapi-fromdefinition-asset/my-api/Deployment/Resource": [
"/integtest-restapi-fromdefinition-asset/my-api/CloudWatchRole/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myapiDeployment92F2CB49d7e5c9cfe50a1616e1cef4517d6b8f96"
"data": "myapiCloudWatchRole095452E5"
}
],
"/integtest-restapi-fromdefinition-asset/my-api/DeploymentStage.prod/Resource": [
"/integtest-restapi-fromdefinition-asset/my-api/Account": [
{
"type": "aws:cdk:logicalId",
"data": "myapiDeploymentStageprod298F01AF"
"data": "myapiAccountEC421A0A"
}
],
"/integtest-restapi-fromdefinition-asset/my-api/Endpoint": [
"/integtest-restapi-fromdefinition-asset/my-api/Deployment/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myapiEndpoint3628AFE3"
"data": "myapiDeployment92F2CB49d7e5c9cfe50a1616e1cef4517d6b8f96"
}
],
"/integtest-restapi-fromdefinition-asset/my-api/CloudWatchRole/Resource": [
"/integtest-restapi-fromdefinition-asset/my-api/DeploymentStage.prod/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myapiCloudWatchRole095452E5"
"data": "myapiDeploymentStageprod298F01AF"
}
],
"/integtest-restapi-fromdefinition-asset/my-api/Account": [
"/integtest-restapi-fromdefinition-asset/my-api/Endpoint": [
{
"type": "aws:cdk:logicalId",
"data": "myapiAccountEC421A0A"
"data": "myapiEndpoint3628AFE3"
}
],
"/integtest-restapi-fromdefinition-asset/PetsURL": [
Expand All @@ -110,15 +110,6 @@
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
],
"myapiDeployment92F2CB49fe116fef7f552ff0fc433c9aa3930d2f": [
{
"type": "aws:cdk:logicalId",
"data": "myapiDeployment92F2CB49fe116fef7f552ff0fc433c9aa3930d2f",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
}
]
},
"displayName": "integtest-restapi-fromdefinition-asset"
Expand Down
2 changes: 1 addition & 1 deletion ...ion.asset.integ.snapshot/restapifromdefinitionDefaultTestDeployAssertDF3B0845.assets.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"version": "20.0.0",
"version": "21.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
Expand Down