Merge branch 'main' into 29539

aws · Mar 29, 2024 · 5c05483 · 5c05483
2 parents 6fe6cc6 + fe4bc1d
commit 5c05483
Show file tree

Hide file tree

Showing 23 changed files with 615 additions and 33 deletions.
diff --git a/....snapshot/asset.aca4a134bf7ace6088b21213be7ab4357e3705f714362b690d76376b8f1df53a/index.js b/....snapshot/asset.aca4a134bf7ace6088b21213be7ab4357e3705f714362b690d76376b8f1df53a/index.js
diff --git a/...4362b690d76376b8f1df53a/__entrypoint__.js → ...5d10cfe133dc43f54705458/__entrypoint__.js b/...4362b690d76376b8f1df53a/__entrypoint__.js → ...5d10cfe133dc43f54705458/__entrypoint__.js
diff --git a/....snapshot/asset.f43e5ef82b45e2e3ecb60cd54aa4a3599da7bb4c85d10cfe133dc43f54705458/index.js b/....snapshot/asset.f43e5ef82b45e2e3ecb60cd54aa4a3599da7bb4c85d10cfe133dc43f54705458/index.js
diff --git a/...ccount-zone-delegation.js.snapshot/child-opt-in-stack-with-assume-role-region.assets.json b/...ccount-zone-delegation.js.snapshot/child-opt-in-stack-with-assume-role-region.assets.json
diff --git a/...ount-zone-delegation.js.snapshot/child-opt-in-stack-with-assume-role-region.template.json b/...ount-zone-delegation.js.snapshot/child-opt-in-stack-with-assume-role-region.template.json
@@ -0,0 +1,159 @@
+{
+ "Resources": {
+  "SubZoneF7955E1A": {
+   "Type": "AWS::Route53::HostedZone",
+   "Properties": {
+    "Name": "sub3.uniqueexample.com."
+   }
+  },
+  "delegatecrossaccountzonedelegationhandlerrolePolicychildoptinstackwithassumeroleregiondelegatecrossaccountzonedelegationhandlerroleA822DAE1970772B0": {
+   "Type": "AWS::IAM::Policy",
+   "Properties": {
+    "PolicyDocument": {
+     "Statement": [
+      {
+       "Action": "sts:AssumeRole",
+       "Effect": "Allow",
+       "Resource": "arn:aws:iam::12345678:role/MyUniqueDelegationRole"
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "PolicyName": "PolicychildoptinstackwithassumeroleregiondelegatecrossaccountzonedelegationhandlerroleA822DAE1",
+    "Roles": [
+     {
+      "Fn::Select": [
+       1,
+       {
+        "Fn::Split": [
+         "/",
+         {
+          "Fn::Select": [
+           5,
+           {
+            "Fn::Split": [
+             ":",
+             {
+              "Fn::GetAtt": [
+               "CustomCrossAccountZoneDelegationCustomResourceProviderRoleED64687B",
+               "Arn"
+              ]
+             }
+            ]
+           }
+          ]
+         }
+        ]
+       }
+      ]
+     }
+    ]
+   }
+  },
+  "delegateCrossAccountZoneDelegationCustomResource23BD590B": {
+   "Type": "Custom::CrossAccountZoneDelegation",
+   "Properties": {
+    "ServiceToken": {
+     "Fn::GetAtt": [
+      "CustomCrossAccountZoneDelegationCustomResourceProviderHandler44A84265",
+      "Arn"
+     ]
+    },
+    "AssumeRoleArn": "arn:aws:iam::12345678:role/MyUniqueDelegationRole",
+    "ParentZoneName": "uniqueexample.com",
+    "DelegatedZoneName": "sub3.uniqueexample.com",
+    "DelegatedZoneNameServers": {
+     "Fn::GetAtt": [
+      "SubZoneF7955E1A",
+      "NameServers"
+     ]
+    },
+    "TTL": 172800,
+    "AssumeRoleRegion": "eu-west-1"
+   },
+   "DependsOn": [
+    "delegatecrossaccountzonedelegationhandlerrolePolicychildoptinstackwithassumeroleregiondelegatecrossaccountzonedelegationhandlerroleA822DAE1970772B0"
+   ],
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
+  "CustomCrossAccountZoneDelegationCustomResourceProviderRoleED64687B": {
+   "Type": "AWS::IAM::Role",
+   "Properties": {
+    "AssumeRolePolicyDocument": {
+     "Version": "2012-10-17",
+     "Statement": [
+      {
+       "Action": "sts:AssumeRole",
+       "Effect": "Allow",
+       "Principal": {
+        "Service": "lambda.amazonaws.com"
+       }
+      }
+     ]
+    },
+    "ManagedPolicyArns": [
+     {
+      "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+     }
+    ]
+   }
+  },
+  "CustomCrossAccountZoneDelegationCustomResourceProviderHandler44A84265": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "S3Bucket": "cdk-hnb659fds-assets-234567890123-af-south-1",
+     "S3Key": "f43e5ef82b45e2e3ecb60cd54aa4a3599da7bb4c85d10cfe133dc43f54705458.zip"
+    },
+    "Timeout": 900,
+    "MemorySize": 128,
+    "Handler": "__entrypoint__.handler",
+    "Role": {
+     "Fn::GetAtt": [
+      "CustomCrossAccountZoneDelegationCustomResourceProviderRoleED64687B",
+      "Arn"
+     ]
+    },
+    "Runtime": "nodejs18.x"
+   },
+   "DependsOn": [
+    "CustomCrossAccountZoneDelegationCustomResourceProviderRoleED64687B"
+   ]
+  }
+ },
+ "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/...ute53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.assets.json b/...ute53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.assets.json
diff --git a/...e53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.template.json b/...e53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.template.json
@@ -3,7 +3,7 @@
   "SubZoneF7955E1A": {
    "Type": "AWS::Route53::HostedZone",
    "Properties": {
-    "Name": "sub.uniqueexample.com."
+    "Name": "sub2.uniqueexample.com."
    }
   },
   "delegatecrossaccountzonedelegationhandlerrolePolicychildoptinstackdelegatecrossaccountzonedelegationhandlerroleD1C6F26DE28FC01D": {
@@ -61,7 +61,7 @@
     },
     "AssumeRoleArn": "arn:aws:iam::12345678:role/MyUniqueDelegationRole",
     "ParentZoneName": "uniqueexample.com",
-    "DelegatedZoneName": "sub.uniqueexample.com",
+    "DelegatedZoneName": "sub2.uniqueexample.com",
     "DelegatedZoneNameServers": {
      "Fn::GetAtt": [
       "SubZoneF7955E1A",
@@ -103,7 +103,7 @@
    "Properties": {
     "Code": {
      "S3Bucket": "cdk-hnb659fds-assets-234567890123-af-south-1",
-     "S3Key": "aca4a134bf7ace6088b21213be7ab4357e3705f714362b690d76376b8f1df53a.zip"
+     "S3Key": "f43e5ef82b45e2e3ecb60cd54aa4a3599da7bb4c85d10cfe133dc43f54705458.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,

diff --git a/.../aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.assets.json b/.../aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.assets.json
diff --git a/...ws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.template.json b/...ws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.template.json
@@ -103,7 +103,7 @@
    "Properties": {
     "Code": {
      "S3Bucket": "cdk-hnb659fds-assets-234567890123-us-east-1",
-     "S3Key": "aca4a134bf7ace6088b21213be7ab4357e3705f714362b690d76376b8f1df53a.zip"
+     "S3Key": "f43e5ef82b45e2e3ecb60cd54aa4a3599da7bb4c85d10cfe133dc43f54705458.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,

diff --git a/...rk-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/integ.json b/...rk-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/integ.json