Merge branch 'main' into ecs-incorrect-throw-statement

aws · May 29, 2024 · 9964cb7 · 9964cb7
2 parents 323caa1 + c8f2646
commit 9964cb7
Show file tree

Hide file tree

Showing 12 changed files with 723 additions and 36 deletions.
diff --git a/...ronment-grant.js.snapshot/appconfigenvironmentDefaultTestDeployAssert75BD28E7.assets.json b/...ronment-grant.js.snapshot/appconfigenvironmentDefaultTestDeployAssert75BD28E7.assets.json
diff --git a/...nment-grant.js.snapshot/appconfigenvironmentDefaultTestDeployAssert75BD28E7.template.json b/...nment-grant.js.snapshot/appconfigenvironmentDefaultTestDeployAssert75BD28E7.template.json
diff --git a/...nfig/test/integ.environment-grant.js.snapshot/aws-appconfig-environment-grant.assets.json b/...nfig/test/integ.environment-grant.js.snapshot/aws-appconfig-environment-grant.assets.json
diff --git a/...ig/test/integ.environment-grant.js.snapshot/aws-appconfig-environment-grant.template.json b/...ig/test/integ.environment-grant.js.snapshot/aws-appconfig-environment-grant.template.json
@@ -0,0 +1,107 @@
+{
+ "Resources": {
+  "MyApplicationForEnv1F597ED9": {
+   "Type": "AWS::AppConfig::Application",
+   "Properties": {
+    "Name": "AppForEnvTest"
+   }
+  },
+  "MyEnvironment465E4DEA": {
+   "Type": "AWS::AppConfig::Environment",
+   "Properties": {
+    "ApplicationId": {
+     "Ref": "MyApplicationForEnv1F597ED9"
+    },
+    "Name": "awsappconfigenvironmentgrant-MyEnvironment-6CC47125"
+   }
+  },
+  "MyUserDC45028B": {
+   "Type": "AWS::IAM::User"
+  },
+  "MyUserDefaultPolicy7B897426": {
+   "Type": "AWS::IAM::Policy",
+   "Properties": {
+    "PolicyDocument": {
+     "Statement": [
+      {
+       "Action": [
+        "appconfig:GetLatestConfiguration",
+        "appconfig:StartConfigurationSession"
+       ],
+       "Effect": "Allow",
+       "Resource": {
+        "Fn::Join": [
+         "",
+         [
+          "arn:",
+          {
+           "Ref": "AWS::Partition"
+          },
+          ":appconfig:",
+          {
+           "Ref": "AWS::Region"
+          },
+          ":",
+          {
+           "Ref": "AWS::AccountId"
+          },
+          ":application/",
+          {
+           "Ref": "MyApplicationForEnv1F597ED9"
+          },
+          "/environment/",
+          {
+           "Ref": "MyEnvironment465E4DEA"
+          },
+          "/configuration/*"
+         ]
+        ]
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "PolicyName": "MyUserDefaultPolicy7B897426",
+    "Users": [
+     {
+      "Ref": "MyUserDC45028B"
+     }
+    ]
+   }
+  }
+ },
+ "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/...sting/framework-integ/test/aws-appconfig/test/integ.environment-grant.js.snapshot/cdk.out b/...sting/framework-integ/test/aws-appconfig/test/integ.environment-grant.js.snapshot/cdk.out
diff --git a/...ng/framework-integ/test/aws-appconfig/test/integ.environment-grant.js.snapshot/integ.json b/...ng/framework-integ/test/aws-appconfig/test/integ.environment-grant.js.snapshot/integ.json
diff --git a/...framework-integ/test/aws-appconfig/test/integ.environment-grant.js.snapshot/manifest.json b/...framework-integ/test/aws-appconfig/test/integ.environment-grant.js.snapshot/manifest.json