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): deployOptions.description is not used for deployment's description #26149

Merged
merged 15 commits into from
Aug 22, 2023
Merged

fix(apigateway): deployOptions.description is not used for deployment's description #26149

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
df6833a
fix(apigateway): use deployOptions.description for deployment's descr…
woltsu Jun 28, 2023
64b6e47
Merge branch 'main' into main
woltsu Jun 28, 2023
aba95d7
refactor
woltsu Jun 28, 2023
5c09463
Merge branch 'main' of github.com:woltsu/aws-cdk
woltsu Jun 28, 2023
7b13cdc
chore: delete unneeded variable name
woltsu Jun 28, 2023
b81149c
fix: add method to test
woltsu Jun 28, 2023
a11d7d6
Merge branch 'main' into main
woltsu Jun 28, 2023
b71ae1d
chore: update integration tests
woltsu Jun 28, 2023
8297a44
Merge branch 'main' of github.com:woltsu/aws-cdk
woltsu Jun 28, 2023
adbf3ee
chore: update integration test with api description
woltsu Jun 28, 2023
5652d11
Merge branch 'main' into main
woltsu Jun 28, 2023
ba12231
Update restapi.ts
rix0rrr Aug 22, 2023
2060d6b
Update restapi.ts
rix0rrr Aug 22, 2023
3366f5e
Merge branch 'main' into main
mrgrain Aug 22, 2023
403fe4a
Merge branch 'main' into main
mergify[bot] Aug 22, 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
2 changes: 1 addition & 1 deletion ...st/integ.restapi.js.snapshot/apigatewayrestapiDefaultTestDeployAssert6A9696A7.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "30.0.0",
"version": "32.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
Expand Down
2 changes: 1 addition & 1 deletion ...ws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/cdk.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"30.0.0"}
{"version":"32.0.0"}
2 changes: 1 addition & 1 deletion ...cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/integ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "30.0.0",
"version": "32.0.0",
"testCases": {
"apigateway-restapi/DefaultTest": {
"stacks": [
Expand Down
16 changes: 8 additions & 8 deletions ...-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "30.0.0",
"version": "32.0.0",
"artifacts": {
"test-apigateway-restapi.assets": {
"type": "cdk:asset-manifest",
Expand All @@ -17,7 +17,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}/94f416193221135915e06201345d08e3db001c8bbf22b073f16ec02d3b8fba4b.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c00b67076079aca10705c26d8b2f87803ff864e13c715f333bcec05a6e7021af.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -54,7 +54,7 @@
"/test-apigateway-restapi/my-api/Deployment/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myapiDeployment92F2CB496a6dee9579dae89ab3a0b094b4d193eb"
"data": "myapiDeployment92F2CB4993c0f175ba8d5964f5e1cc7bc64fe6e6"
}
],
"/test-apigateway-restapi/my-api/DeploymentStage.beta/Resource": [
Expand Down Expand Up @@ -198,7 +198,7 @@
"/test-apigateway-restapi/TestDeployment/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "TestDeploymentD77B56860a9c34c1bc306bfbc7d318827eacd1e1"
"data": "TestDeploymentD77B56865531eba1e8fde4b8e6988d5af7b2efd6"
}
],
"/test-apigateway-restapi/TestStage/Resource": [
Expand All @@ -225,19 +225,19 @@
"data": "CheckBootstrapVersion"
}
],
"myapiDeployment92F2CB4996088bac04ec19d9db88f146f3d88bca": [
"myapiDeployment92F2CB496a6dee9579dae89ab3a0b094b4d193eb": [
{
"type": "aws:cdk:logicalId",
"data": "myapiDeployment92F2CB4996088bac04ec19d9db88f146f3d88bca",
"data": "myapiDeployment92F2CB496a6dee9579dae89ab3a0b094b4d193eb",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
}
],
"TestDeploymentD77B56866f3141cef1e8fea8ab3b3b8bc90df36d": [
"TestDeploymentD77B56860a9c34c1bc306bfbc7d318827eacd1e1": [
{
"type": "aws:cdk:logicalId",
"data": "TestDeploymentD77B56866f3141cef1e8fea8ab3b3b8bc90df36d",
"data": "TestDeploymentD77B56860a9c34c1bc306bfbc7d318827eacd1e1",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
Expand Down
6 changes: 3 additions & 3 deletions ...eg/test/aws-apigateway/test/integ.restapi.js.snapshot/test-apigateway-restapi.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "30.0.0",
"version": "32.0.0",
"files": {
"94f416193221135915e06201345d08e3db001c8bbf22b073f16ec02d3b8fba4b": {
"c00b67076079aca10705c26d8b2f87803ff864e13c715f333bcec05a6e7021af": {
"source": {
"path": "test-apigateway-restapi.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "94f416193221135915e06201345d08e3db001c8bbf22b073f16ec02d3b8fba4b.json",
"objectKey": "c00b67076079aca10705c26d8b2f87803ff864e13c715f333bcec05a6e7021af.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
11 changes: 6 additions & 5 deletions .../test/aws-apigateway/test/integ.restapi.js.snapshot/test-apigateway-restapi.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"myapi4C7BF186": {
"Type": "AWS::ApiGateway::RestApi",
"Properties": {
"Description": "api description",
"MinimumCompressionSize": 1024,
"Name": "my-api"
}
Expand Down Expand Up @@ -56,13 +57,13 @@
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
},
"myapiDeployment92F2CB496a6dee9579dae89ab3a0b094b4d193eb": {
"myapiDeployment92F2CB4993c0f175ba8d5964f5e1cc7bc64fe6e6": {
"Type": "AWS::ApiGateway::Deployment",
"Properties": {
"RestApiId": {
"Ref": "myapi4C7BF186"
},
"Description": "Automatically created by the RestApi construct"
"Description": "beta stage"
},
"DependsOn": [
"myapiv1appliancesallGETC4DF552D",
Expand All @@ -88,7 +89,7 @@
"CacheClusterEnabled": true,
"CacheClusterSize": "0.5",
"DeploymentId": {
"Ref": "myapiDeployment92F2CB496a6dee9579dae89ab3a0b094b4d193eb"
"Ref": "myapiDeployment92F2CB4993c0f175ba8d5964f5e1cc7bc64fe6e6"
},
"Description": "beta stage",
"MethodSettings": [
Expand Down Expand Up @@ -673,7 +674,7 @@
"MyHandlerServiceRoleFFA06653"
]
},
"TestDeploymentD77B56860a9c34c1bc306bfbc7d318827eacd1e1": {
"TestDeploymentD77B56865531eba1e8fde4b8e6988d5af7b2efd6": {
"Type": "AWS::ApiGateway::Deployment",
"Properties": {
"RestApiId": {
Expand All @@ -696,7 +697,7 @@
"Ref": "myapi4C7BF186"
},
"DeploymentId": {
"Ref": "TestDeploymentD77B56860a9c34c1bc306bfbc7d318827eacd1e1"
"Ref": "TestDeploymentD77B56865531eba1e8fde4b8e6988d5af7b2efd6"
},
"StageName": "prod"
},
Expand Down
Loading