Skip to content

Commit

Permalink
Merge branch 'main' into dynamodb-fix-throw-statement
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Jun 4, 2024
2 parents dd6472c + 940e799 commit 2626258
Show file tree
Hide file tree
Showing 99 changed files with 107,429 additions and 108 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jsii/superchain:1-buster-slim-node18
FROM jsii/superchain:1-bookworm-slim-node20

USER root

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/request-cli-integ-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
persist-credentials: false
- name: Find changed cli files
id: changed-cli-files
uses: tj-actions/changed-files@03334d095e2739fa9ac4034ec16f66d5d01e9eba
uses: tj-actions/changed-files@d6babd6899969df1a11d14c368283ea4436bca78
with:
base_sha: ${{ github.event.pull_request.base.sha }}
files_yaml: |
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ github:
pullRequestsFromForks: true
addComment: true

image: public.ecr.aws/jsii/superchain:1-buster-slim-node18
image: public.ecr.aws/jsii/superchain:1-bookworm-slim-node20

tasks:
- init: |
Expand Down

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,70 @@
{
"Resources": {
"MySlackChannelConfigurationRole1D3F23AE": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "chatbot.amazonaws.com"
}
}
],
"Version": "2012-10-17"
}
}
},
"MySlackChannelA8E0B56C": {
"Type": "AWS::Chatbot::SlackChannelConfiguration",
"Properties": {
"ConfigurationName": "test-channel",
"IamRoleArn": {
"Fn::GetAtt": [
"MySlackChannelConfigurationRole1D3F23AE",
"Arn"
]
},
"SlackChannelId": "C07639U21PW",
"SlackWorkspaceId": "T075XU2GKBP",
"UserRoleRequired": true
}
}
},
"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."
}
]
}
}
}

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.

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 2626258

Please sign in to comment.