Merge branch 'main' into fix(apigateway)/restapi-url-property-fix

aws · Dec 5, 2023 · bad5b43 · bad5b43
2 parents 2599828 + 766ff8b
commit bad5b43
Show file tree

Hide file tree

Showing 28 changed files with 800 additions and 66 deletions.
diff --git a/....managed-policy.js.snapshot/ManagedPolicyIntegDefaultTestDeployAssert27007DC6.assets.json b/....managed-policy.js.snapshot/ManagedPolicyIntegDefaultTestDeployAssert27007DC6.assets.json
diff --git a/...test/aws-iam/test/integ.managed-policy.js.snapshot/aws-cdk-iam-managed-policy.assets.json b/...test/aws-iam/test/integ.managed-policy.js.snapshot/aws-cdk-iam-managed-policy.assets.json
diff --git a/...st/aws-iam/test/integ.managed-policy.js.snapshot/aws-cdk-iam-managed-policy.template.json b/...st/aws-iam/test/integ.managed-policy.js.snapshot/aws-cdk-iam-managed-policy.template.json
@@ -25,6 +25,9 @@
   "OneManagedPolicy77F9185F": {
    "Type": "AWS::IAM::ManagedPolicy",
    "Properties": {
+    "Description": "My Policy",
+    "ManagedPolicyName": "Default",
+    "Path": "/some/path/",
     "PolicyDocument": {
      "Statement": [
       {
@@ -45,9 +48,11 @@
      ],
      "Version": "2012-10-17"
     },
-    "Description": "My Policy",
-    "ManagedPolicyName": "Default",
-    "Path": "/some/path/",
+    "Roles": [
+     {
+      "Ref": "Role1ABCC5F0"
+     }
+    ],
     "Users": [
      {
       "Ref": "MyUserDC45028B"
@@ -58,6 +63,8 @@
   "TwoManagedPolicy7E701864": {
    "Type": "AWS::IAM::ManagedPolicy",
    "Properties": {
+    "Description": "",
+    "Path": "/",
     "PolicyDocument": {
      "Statement": [
       {
@@ -77,9 +84,7 @@
       }
      ],
      "Version": "2012-10-17"
-    },
-    "Description": "",
-    "Path": "/"
+    }
    }
   },
   "Role1ABCC5F0": {

diff --git a/...ws-cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/cdk.out b/...ws-cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/cdk.out
diff --git a/...cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/integ.json b/...cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/integ.json
diff --git a/...-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/manifest.json b/...-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/manifest.json
diff --git a/...-cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/tree.json b/...-cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/tree.json
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.ts
@@ -27,6 +27,12 @@ const role = new Role(stack, 'Role', { assumedBy: new AccountRootPrincipal() });
 role.grantAssumeRole(policy.grantPrincipal);
 Grant.addToPrincipal({ actions: ['iam:*'], resourceArns: [role.roleArn], grantee: policy2 });
 
+policy.attachToRole(role);
+
+// Idempotent with imported roles, see https://github.com/aws/aws-cdk/issues/28101
+const importedRole = Role.fromRoleArn(stack, 'ImportedRole', role.roleArn);
+policy.attachToRole(importedRole);
+
 new IntegTest(app, 'ManagedPolicyInteg', {
   testCases: [stack],
 });
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-iam/test/integ.role.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-iam/test/integ.role.ts
@@ -16,6 +16,10 @@ const policy = new Policy(stack, 'HelloPolicy', { policyName: 'Default' });
 policy.addStatements(new PolicyStatement({ actions: ['ec2:*'], resources: ['*'] }));
 policy.attachToRole(role);
 
+// Idempotent with imported roles, see https://github.com/aws/aws-cdk/issues/28101
+const importedRole = Role.fromRoleArn(stack, 'TestImportedRole', role.roleArn);
+policy.attachToRole(importedRole);
+
 // Role with an external ID
 new Role(stack, 'TestRole2', {
   assumedBy: new AccountRootPrincipal(),

diff --git a/packages/@aws-cdk/aws-appconfig-alpha/README.md b/packages/@aws-cdk/aws-appconfig-alpha/README.md
@@ -356,11 +356,13 @@ Basic environment with monitors:
 ```ts
 declare const application: appconfig.Application;
 declare const alarm: cloudwatch.Alarm;
+declare const compositeAlarm: cloudwatch.CompositeAlarm;
 
 new appconfig.Environment(this, 'MyEnvironment', {
   application,
   monitors: [
     appconfig.Monitor.fromCloudWatchAlarm(alarm),
+    appconfig.Monitor.fromCloudWatchAlarm(compositeAlarm),
   ],
 });
 ```