Skip to content

Commit

Permalink
Merge branch 'main' into feat/lambda-dotnet
Browse files Browse the repository at this point in the history
  • Loading branch information
vlesierse authored Nov 23, 2023
2 parents 594dea3 + 31c18f7 commit b7675c0
Show file tree
Hide file tree
Showing 329 changed files with 114,496 additions and 7,205 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- name: 'Download artifact'
if: github.event_name == 'workflow_run'
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-metadata-regions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
status=$(curl -s -o /dev/null -w "%{http_code}" $URL)
echo "STATUS=${status}" >> "$GITHUB_OUTPUT"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/github-script@v7
if: ${{ steps.download.outputs.STATUS == 200 }}
env:
Expand Down
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.110.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.110.0-alpha.0...v2.110.1-alpha.0) (2023-11-21)

## [2.110.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.109.0-alpha.0...v2.110.0-alpha.0) (2023-11-16)

## [2.109.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.108.1-alpha.0...v2.109.0-alpha.0) (2023-11-15)
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.110.1](https://github.com/aws/aws-cdk/compare/v2.110.0...v2.110.1) (2023-11-21)


### Bug Fixes

* **cli:** hotswap cannot evaluate nested stacks within nested stacks ([8fa6bdd](https://github.com/aws/aws-cdk/commit/8fa6bdd86ca673649d2498304311f288fad524c0))

## [2.110.0](https://github.com/aws/aws-cdk/compare/v2.109.0...v2.110.0) (2023-11-16)


Expand Down
3 changes: 0 additions & 3 deletions buildspec-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ phases:
# this also takes care of launching the docker daemon.
- /root/ecr-proxy/start.sh

# CodeBuild always runs as root, allow npm to operate as such
#- npm config set unsafe-perm true

# Install yarn if it wasn't already present in the image
- yarn --version || npm -g install yarn

Expand Down
3 changes: 0 additions & 3 deletions buildspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ phases:
# this also takes care of launching the docker daemon.
- /root/ecr-proxy/start.sh

# CodeBuild always runs as root, allow npm to operate as such
- npm config set unsafe-perm true

# Install yarn if it wasn't already present in the image
- yarn --version || npm -g install yarn

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
},
"MyRestApiDeploymentB555B582d83364d66d67f510f848797cd89349d5": {
"MyRestApiDeploymentB555B58276a4103e7ef38befb395a9ace5fdce44": {
"Type": "AWS::ApiGateway::Deployment",
"Properties": {
"Description": "Automatically created by the RestApi construct",
Expand All @@ -208,7 +208,7 @@
"Type": "AWS::ApiGateway::Stage",
"Properties": {
"DeploymentId": {
"Ref": "MyRestApiDeploymentB555B582d83364d66d67f510f848797cd89349d5"
"Ref": "MyRestApiDeploymentB555B58276a4103e7ef38befb395a9ace5fdce44"
},
"RestApiId": {
"Ref": "MyRestApi2D1F47A9"
Expand Down Expand Up @@ -306,6 +306,7 @@
"MyAuthorizer6575980E": {
"Type": "AWS::ApiGateway::Authorizer",
"Properties": {
"AuthorizerResultTtlInSeconds": 300,
"AuthorizerUri": {
"Fn::Join": [
"",
Expand Down Expand Up @@ -366,6 +367,7 @@
"MySecondAuthorizer25A69B96": {
"Type": "AWS::ApiGateway::Authorizer",
"Properties": {
"AuthorizerResultTtlInSeconds": 300,
"AuthorizerUri": {
"Fn::Join": [
"",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
"Arn"
]
},
"AuthorizerResultTtlInSeconds": 300,
"AuthorizerUri": {
"Fn::Join": [
"",
Expand Down Expand Up @@ -233,7 +234,7 @@
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
},
"MyRestApiDeploymentB555B582694e8eb3fdb7b5f988ba347d35601979": {
"MyRestApiDeploymentB555B58259401a546b13c99de2d05e5e255a9ede": {
"Type": "AWS::ApiGateway::Deployment",
"Properties": {
"Description": "Automatically created by the RestApi construct",
Expand All @@ -251,7 +252,7 @@
"Type": "AWS::ApiGateway::Stage",
"Properties": {
"DeploymentId": {
"Ref": "MyRestApiDeploymentB555B582694e8eb3fdb7b5f988ba347d35601979"
"Ref": "MyRestApiDeploymentB555B58259401a546b13c99de2d05e5e255a9ede"
},
"RestApiId": {
"Ref": "MyRestApi2D1F47A9"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
"MyAuthorizer6575980E": {
"Type": "AWS::ApiGateway::Authorizer",
"Properties": {
"AuthorizerResultTtlInSeconds": 600,
"AuthorizerUri": {
"Fn::Join": [
"",
Expand Down Expand Up @@ -208,7 +209,7 @@
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
},
"MyRestApiDeploymentB555B582e0e53f2547b469b538202de55968eaf0": {
"MyRestApiDeploymentB555B5827a9cde8f137f97e5aa74fca164d09d74": {
"Type": "AWS::ApiGateway::Deployment",
"Properties": {
"Description": "Automatically created by the RestApi construct",
Expand All @@ -226,7 +227,7 @@
"Type": "AWS::ApiGateway::Stage",
"Properties": {
"DeploymentId": {
"Ref": "MyRestApiDeploymentB555B582e0e53f2547b469b538202de55968eaf0"
"Ref": "MyRestApiDeploymentB555B5827a9cde8f137f97e5aa74fca164d09d74"
},
"RestApiId": {
"Ref": "MyRestApi2D1F47A9"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const authorizerFn = new lambda.Function(stack, 'MyAuthorizerFunction', {

const authorizer = new TokenAuthorizer(stack, 'MyAuthorizer', {
handler: authorizerFn,
resultsCacheTtl: Duration.minutes(10),
});

const restapi = new RestApi(stack, 'MyRestApi', {
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.

Loading

0 comments on commit b7675c0

Please sign in to comment.