Skip to content

Commit

Permalink
Merge branch 'main' into cdkasset-docker-config
Browse files Browse the repository at this point in the history
  • Loading branch information
gyalai-aws committed Jul 12, 2024
2 parents c806ea5 + 5ef3be5 commit 403697f
Show file tree
Hide file tree
Showing 145 changed files with 50,586 additions and 27,187 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.v2.alpha.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [2.148.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.148.0-alpha.0...v2.148.1-alpha.0) (2024-07-11)

## [2.148.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.147.3-alpha.0...v2.148.0-alpha.0) (2024-07-05)


Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [2.148.1](https://github.com/aws/aws-cdk/compare/v2.148.0...v2.148.1) (2024-07-11)


### Bug Fixes

* **apigateway:** authorization scope is not added when not explicitly defining authorization type in method or root api ([#30822](https://github.com/aws/aws-cdk/issues/30822)) ([4bee768](https://github.com/aws/aws-cdk/commit/4bee768f07e73ab5fe466f9ad3d1845456a0513b)), closes [#30444](https://github.com/aws/aws-cdk/issues/30444)

## [2.148.0](https://github.com/aws/aws-cdk/compare/v2.147.3...v2.148.0) (2024-07-05)


Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
{
"Resources": {
"UserPool6BA7E5F2": {
"Type": "AWS::Cognito::UserPool",
"Properties": {
"AccountRecoverySetting": {
"RecoveryMechanisms": [
{
"Name": "verified_phone_number",
"Priority": 1
},
{
"Name": "verified_email",
"Priority": 2
}
]
},
"AdminCreateUserConfig": {
"AllowAdminCreateUserOnly": true
},
"EmailVerificationMessage": "The verification code to your new account is {####}",
"EmailVerificationSubject": "Verify your new account",
"SmsVerificationMessage": "The verification code to your new account is {####}",
"VerificationMessageTemplate": {
"DefaultEmailOption": "CONFIRM_WITH_CODE",
"EmailMessage": "The verification code to your new account is {####}",
"EmailSubject": "Verify your new account",
"SmsMessage": "The verification code to your new account is {####}"
}
},
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
},
"AuthorizerBD825682": {
"Type": "AWS::ApiGateway::Authorizer",
"Properties": {
"IdentitySource": "method.request.header.Authorization",
"Name": "integtestrestapiwithauthorizerandproxyAuthorizer5142DDC8",
"ProviderARNs": [
{
"Fn::GetAtt": [
"UserPool6BA7E5F2",
"Arn"
]
}
],
"RestApiId": {
"Ref": "CdkTestStack0AE13CA5"
},
"Type": "COGNITO_USER_POOLS"
}
},
"CdkTestStack0AE13CA5": {
"Type": "AWS::ApiGateway::RestApi",
"Properties": {
"Name": "CdkTestStack"
}
},
"CdkTestStackDeployment201712E9c8d53ab4e4cdcaa7ab0f70bb7f6ce970": {
"Type": "AWS::ApiGateway::Deployment",
"Properties": {
"Description": "Automatically created by the RestApi construct",
"RestApiId": {
"Ref": "CdkTestStack0AE13CA5"
}
},
"DependsOn": [
"AuthorizerBD825682",
"CdkTestStackotherPOST3BA23287",
"CdkTestStackother6044D106",
"CdkTestStackuserGET1317379E",
"CdkTestStackuser7876F2D4"
]
},
"CdkTestStackDeploymentStageprod296E6472": {
"Type": "AWS::ApiGateway::Stage",
"Properties": {
"DeploymentId": {
"Ref": "CdkTestStackDeployment201712E9c8d53ab4e4cdcaa7ab0f70bb7f6ce970"
},
"RestApiId": {
"Ref": "CdkTestStack0AE13CA5"
},
"StageName": "prod"
}
},
"CdkTestStackuser7876F2D4": {
"Type": "AWS::ApiGateway::Resource",
"Properties": {
"ParentId": {
"Fn::GetAtt": [
"CdkTestStack0AE13CA5",
"RootResourceId"
]
},
"PathPart": "user",
"RestApiId": {
"Ref": "CdkTestStack0AE13CA5"
}
}
},
"CdkTestStackuserGET1317379E": {
"Type": "AWS::ApiGateway::Method",
"Properties": {
"AuthorizationScopes": [
"profile"
],
"AuthorizationType": "COGNITO_USER_POOLS",
"AuthorizerId": {
"Ref": "AuthorizerBD825682"
},
"HttpMethod": "GET",
"Integration": {
"Type": "MOCK"
},
"ResourceId": {
"Ref": "CdkTestStackuser7876F2D4"
},
"RestApiId": {
"Ref": "CdkTestStack0AE13CA5"
}
}
},
"CdkTestStackother6044D106": {
"Type": "AWS::ApiGateway::Resource",
"Properties": {
"ParentId": {
"Fn::GetAtt": [
"CdkTestStack0AE13CA5",
"RootResourceId"
]
},
"PathPart": "other",
"RestApiId": {
"Ref": "CdkTestStack0AE13CA5"
}
}
},
"CdkTestStackotherPOST3BA23287": {
"Type": "AWS::ApiGateway::Method",
"Properties": {
"AuthorizationScopes": [
"openid"
],
"AuthorizationType": "COGNITO_USER_POOLS",
"AuthorizerId": {
"Ref": "AuthorizerBD825682"
},
"HttpMethod": "POST",
"Integration": {
"Type": "MOCK"
},
"ResourceId": {
"Ref": "CdkTestStackother6044D106"
},
"RestApiId": {
"Ref": "CdkTestStack0AE13CA5"
}
}
}
},
"Outputs": {
"CdkTestStackEndpoint7DDDB759": {
"Value": {
"Fn::Join": [
"",
[
"https://",
{
"Ref": "CdkTestStack0AE13CA5"
},
".execute-api.",
{
"Ref": "AWS::Region"
},
".",
{
"Ref": "AWS::URLSuffix"
},
"/",
{
"Ref": "CdkTestStackDeploymentStageprod296E6472"
},
"/"
]
]
}
}
},
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
}
},
"Rules": {
"CheckBootstrapVersion": {
"Assertions": [
{
"Assert": {
"Fn::Not": [
{
"Fn::Contains": [
[
"1",
"2",
"3",
"4",
"5"
],
{
"Ref": "BootstrapVersion"
}
]
}
]
},
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
}
]
}
}
}
Loading

0 comments on commit 403697f

Please sign in to comment.