Merge branch 'main' into validate-hosted-zone-ns

aws · Jun 3, 2024 · dde1d3f · dde1d3f
2 parents 5f048b2 + ddbbd00
commit dde1d3f
Show file tree

Hide file tree

Showing 37 changed files with 5,193 additions and 1,985 deletions.
diff --git a/...st/aws-chatbot/test/integ.chatbot-user-role-required.js.snapshot/ChatbotInteg.assets.json b/...st/aws-chatbot/test/integ.chatbot-user-role-required.js.snapshot/ChatbotInteg.assets.json
diff --git a/.../aws-chatbot/test/integ.chatbot-user-role-required.js.snapshot/ChatbotInteg.template.json b/.../aws-chatbot/test/integ.chatbot-user-role-required.js.snapshot/ChatbotInteg.template.json
@@ -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."
+    }
+   ]
+  }
+ }
+}
diff --git a/...ramework-integ/test/aws-chatbot/test/integ.chatbot-user-role-required.js.snapshot/cdk.out b/...ramework-integ/test/aws-chatbot/test/integ.chatbot-user-role-required.js.snapshot/cdk.out
diff --git a/...ework-integ/test/aws-chatbot/test/integ.chatbot-user-role-required.js.snapshot/integ.json b/...ework-integ/test/aws-chatbot/test/integ.chatbot-user-role-required.js.snapshot/integ.json
diff --git a/...uired.js.snapshot/integchatbotuserrolerequiredDefaultTestDeployAssert995C2DD6.assets.json b/...uired.js.snapshot/integchatbotuserrolerequiredDefaultTestDeployAssert995C2DD6.assets.json
diff --git a/...red.js.snapshot/integchatbotuserrolerequiredDefaultTestDeployAssert995C2DD6.template.json b/...red.js.snapshot/integchatbotuserrolerequiredDefaultTestDeployAssert995C2DD6.template.json
diff --git a/...rk-integ/test/aws-chatbot/test/integ.chatbot-user-role-required.js.snapshot/manifest.json b/...rk-integ/test/aws-chatbot/test/integ.chatbot-user-role-required.js.snapshot/manifest.json