From 329accc1f1b0775350a37bbc6675c90730382c26 Mon Sep 17 00:00:00 2001 From: Colin Francis <131073567+colifran@users.noreply.github.com> Date: Wed, 29 Nov 2023 08:20:16 -0800 Subject: [PATCH] chore(route53): migrate cross account zone handler (#28134) This PR moves the cross account zone handler from aws-cdk-lib to our new centralized location for custom resource handlers in the [@aws-cdk](https://github.com/aws-cdk) package. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../index.js | 95 ------------------- .../__entrypoint__.js | 0 .../index.js | 1 + .../child-opt-in-stack.assets.json | 10 +- .../child-opt-in-stack.template.json | 2 +- .../child-stack.assets.json | 10 +- .../child-stack.template.json | 2 +- .../manifest.json | 4 +- .../index.ts | 0 ...s-account-zone-delegation-handler.test.ts} | 2 +- .../.is_custom_resource | 0 .../aws-cdk-lib/aws-route53/lib/record-set.ts | 2 +- 12 files changed, 17 insertions(+), 111 deletions(-) delete mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7/index.js rename packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/{asset.2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7 => asset.8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a}/__entrypoint__.js (100%) create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a/index.js rename packages/{aws-cdk-lib/aws-route53/lib => @aws-cdk/custom-resource-handlers/lib/aws-route53}/cross-account-zone-delegation-handler/index.ts (100%) rename packages/{aws-cdk-lib/aws-route53/test/cross-account-zone-delegation-handler/index.test.ts => @aws-cdk/custom-resource-handlers/test/aws-route53/cross-account-zone-delegation-handler.test.ts} (98%) delete mode 100644 packages/aws-cdk-lib/aws-route53/lib/cross-account-zone-delegation-handler/.is_custom_resource diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7/index.js b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7/index.js deleted file mode 100644 index f97f8b1e0dc62..0000000000000 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7/index.js +++ /dev/null @@ -1,95 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.handler = void 0; -// eslint-disable-next-line import/no-extraneous-dependencies -const client_route_53_1 = require("@aws-sdk/client-route-53"); -// eslint-disable-next-line import/no-extraneous-dependencies -const credential_providers_1 = require("@aws-sdk/credential-providers"); -async function handler(event) { - const resourceProps = event.ResourceProperties; - switch (event.RequestType) { - case 'Create': - case 'Update': - return cfnEventHandler(resourceProps, false); - case 'Delete': - return cfnEventHandler(resourceProps, true); - } -} -exports.handler = handler; -async function cfnEventHandler(props, isDeleteEvent) { - const { AssumeRoleArn, ParentZoneId, ParentZoneName, DelegatedZoneName, DelegatedZoneNameServers, TTL } = props; - if (!ParentZoneId && !ParentZoneName) { - throw Error('One of ParentZoneId or ParentZoneName must be specified'); - } - const timestamp = (new Date()).getTime(); - const route53 = new client_route_53_1.Route53({ - credentials: (0, credential_providers_1.fromTemporaryCredentials)({ - clientConfig: { - region: route53Region(process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? ''), - }, - params: { - RoleArn: AssumeRoleArn, - RoleSessionName: `cross-account-zone-delegation-${timestamp}`, - }, - }), - }); - const parentZoneId = ParentZoneId ?? await getHostedZoneIdByName(ParentZoneName, route53); - await route53.changeResourceRecordSets({ - HostedZoneId: parentZoneId, - ChangeBatch: { - Changes: [{ - Action: isDeleteEvent ? 'DELETE' : 'UPSERT', - ResourceRecordSet: { - Name: DelegatedZoneName, - Type: 'NS', - TTL, - ResourceRecords: DelegatedZoneNameServers.map(ns => ({ Value: ns })), - }, - }], - }, - }); -} -async function getHostedZoneIdByName(name, route53) { - const zones = await route53.listHostedZonesByName({ DNSName: name }); - const matchedZones = zones.HostedZones?.filter(zone => zone.Name === `${name}.`) ?? []; - if (matchedZones && matchedZones.length !== 1) { - throw Error(`Expected one hosted zone to match the given name but found ${matchedZones.length}`); - } - // will always be defined because we throw if length !==1 - return matchedZones[0].Id; -} -/** - * Return the region that hosts the Route53 endpoint - * - * Route53 is a partitional service: the control plane lives in one particular region, - * which is different for every partition. - * - * The SDK knows how to convert a "target region" to a "route53 endpoint", which - * equates to a (potentially different) region. However, when we use STS - * AssumeRole credentials, we must grab credentials that will work in that - * region. - * - * By default, STS AssumeRole will call the STS endpoint for the same region - * as the Lambda runs in. Normally, this is all good. However, when the AssumeRole - * is used to assume a role in a different account A, the AssumeRole will fail if the - * Lambda is executing in an an opt-in region R to which account A has not been opted in. - * - * To solve this, we will always AssumeRole in the same region as the Route53 call will - * resolve to. - */ -function route53Region(region) { - const partitions = { - 'cn': 'cn-northwest-1', - 'us-gov': 'us-gov-west-1', - 'us-iso': 'us-iso-east-1', - 'us-isob': 'us-isob-east-1', - }; - for (const [prefix, mainRegion] of Object.entries(partitions)) { - if (region.startsWith(`${prefix}-`)) { - return mainRegion; - } - } - // Default for commercial partition - return 'us-east-1'; -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["// eslint-disable-next-line import/no-extraneous-dependencies\nimport { Route53 } from '@aws-sdk/client-route-53';\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport { fromTemporaryCredentials } from '@aws-sdk/credential-providers';\n\ninterface ResourceProperties {\n  AssumeRoleArn: string,\n  ParentZoneName?: string,\n  ParentZoneId?: string,\n  DelegatedZoneName: string,\n  DelegatedZoneNameServers: string[],\n  TTL: number,\n}\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent) {\n  const resourceProps = event.ResourceProperties as unknown as ResourceProperties;\n\n  switch (event.RequestType) {\n    case 'Create':\n    case 'Update':\n      return cfnEventHandler(resourceProps, false);\n    case 'Delete':\n      return cfnEventHandler(resourceProps, true);\n  }\n}\n\nasync function cfnEventHandler(props: ResourceProperties, isDeleteEvent: boolean) {\n  const { AssumeRoleArn, ParentZoneId, ParentZoneName, DelegatedZoneName, DelegatedZoneNameServers, TTL } = props;\n\n  if (!ParentZoneId && !ParentZoneName) {\n    throw Error('One of ParentZoneId or ParentZoneName must be specified');\n  }\n\n  const timestamp = (new Date()).getTime();\n  const route53 = new Route53({\n    credentials: fromTemporaryCredentials({\n      clientConfig: {\n        region: route53Region(process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? ''),\n      },\n      params: {\n        RoleArn: AssumeRoleArn,\n        RoleSessionName: `cross-account-zone-delegation-${timestamp}`,\n      },\n    }),\n  });\n\n  const parentZoneId = ParentZoneId ?? await getHostedZoneIdByName(ParentZoneName!, route53);\n\n  await route53.changeResourceRecordSets({\n    HostedZoneId: parentZoneId,\n    ChangeBatch: {\n      Changes: [{\n        Action: isDeleteEvent ? 'DELETE' : 'UPSERT',\n        ResourceRecordSet: {\n          Name: DelegatedZoneName,\n          Type: 'NS',\n          TTL,\n          ResourceRecords: DelegatedZoneNameServers.map(ns => ({ Value: ns })),\n        },\n      }],\n    },\n  });\n}\n\nasync function getHostedZoneIdByName(name: string, route53: Route53): Promise<string> {\n  const zones = await route53.listHostedZonesByName({ DNSName: name });\n  const matchedZones = zones.HostedZones?.filter(zone => zone.Name === `${name}.`) ?? [];\n\n  if (matchedZones && matchedZones.length !== 1) {\n    throw Error(`Expected one hosted zone to match the given name but found ${matchedZones.length}`);\n  }\n\n  // will always be defined because we throw if length !==1\n  return matchedZones[0].Id!;\n}\n\n/**\n * Return the region that hosts the Route53 endpoint\n *\n * Route53 is a partitional service: the control plane lives in one particular region,\n * which is different for every partition.\n *\n * The SDK knows how to convert a \"target region\" to a \"route53 endpoint\", which\n * equates to a (potentially different) region. However, when we use STS\n * AssumeRole credentials, we must grab credentials that will work in that\n * region.\n *\n * By default, STS AssumeRole will call the STS endpoint for the same region\n * as the Lambda runs in. Normally, this is all good. However, when the AssumeRole\n * is used to assume a role in a different account A, the AssumeRole will fail if the\n * Lambda is executing in an an opt-in region R to which account A has not been opted in.\n *\n * To solve this, we will always AssumeRole in the same region as the Route53 call will\n * resolve to.\n */\nfunction route53Region(region: string) {\n  const partitions = {\n    'cn': 'cn-northwest-1',\n    'us-gov': 'us-gov-west-1',\n    'us-iso': 'us-iso-east-1',\n    'us-isob': 'us-isob-east-1',\n  };\n\n  for (const [prefix, mainRegion] of Object.entries(partitions)) {\n    if (region.startsWith(`${prefix}-`)) {\n      return mainRegion;\n    }\n  }\n\n  // Default for commercial partition\n  return 'us-east-1';\n}"]} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7/__entrypoint__.js b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a/__entrypoint__.js similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7/__entrypoint__.js rename to packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a/__entrypoint__.js diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a/index.js b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a/index.js new file mode 100644 index 0000000000000..6d83e08cd46ad --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a/index.js @@ -0,0 +1 @@ +"use strict";var r=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var N=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var Z=(o,e)=>{for(var s in e)r(o,s,{get:e[s],enumerable:!0})},P=(o,e,s,t)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of N(e))!h.call(o,n)&&n!==s&&r(o,n,{get:()=>e[n],enumerable:!(t=f(e,n))||t.enumerable});return o};var E=o=>P(r({},"__esModule",{value:!0}),o);var A={};Z(A,{handler:()=>w});module.exports=E(A);var c=require("@aws-sdk/client-route-53"),u=require("@aws-sdk/credential-providers");async function w(o){let e=o.ResourceProperties;switch(o.RequestType){case"Create":case"Update":return i(e,!1);case"Delete":return i(e,!0)}}async function i(o,e){let{AssumeRoleArn:s,ParentZoneId:t,ParentZoneName:n,DelegatedZoneName:m,DelegatedZoneNameServers:d,TTL:g}=o;if(!t&&!n)throw Error("One of ParentZoneId or ParentZoneName must be specified");let l=new Date().getTime(),a=new c.Route53({credentials:(0,u.fromTemporaryCredentials)({clientConfig:{region:T(process.env.AWS_REGION??process.env.AWS_DEFAULT_REGION??"")},params:{RoleArn:s,RoleSessionName:`cross-account-zone-delegation-${l}`}})}),R=t??await S(n,a);await a.changeResourceRecordSets({HostedZoneId:R,ChangeBatch:{Changes:[{Action:e?"DELETE":"UPSERT",ResourceRecordSet:{Name:m,Type:"NS",TTL:g,ResourceRecords:d.map(p=>({Value:p}))}}]}})}async function S(o,e){let t=(await e.listHostedZonesByName({DNSName:o})).HostedZones?.filter(n=>n.Name===`${o}.`)??[];if(t&&t.length!==1)throw Error(`Expected one hosted zone to match the given name but found ${t.length}`);return t[0].Id}function T(o){let e={cn:"cn-northwest-1","us-gov":"us-gov-west-1","us-iso":"us-iso-east-1","us-isob":"us-isob-east-1"};for(let[s,t]of Object.entries(e))if(o.startsWith(`${s}-`))return t;return"us-east-1"}0&&(module.exports={handler}); diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.assets.json index 98e48868ca461..120006848b7f4 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.assets.json @@ -1,21 +1,21 @@ { "version": "35.0.0", "files": { - "2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7": { + "8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a": { "source": { - "path": "asset.2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7", + "path": "asset.8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a", "packaging": "zip" }, "destinations": { "234567890123-af-south-1": { "bucketName": "cdk-hnb659fds-assets-234567890123-af-south-1", - "objectKey": "2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7.zip", + "objectKey": "8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a.zip", "region": "af-south-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::234567890123:role/cdk-hnb659fds-file-publishing-role-234567890123-af-south-1" } } }, - "724fcbf9d2e61f5f01219e5ccf1893c6a7e501628b6b58e7f196e06a8ffc40a4": { + "6d179d9e2df3b560501778a556c740c38cc7bb570462ba98f24a0ecc276c5979": { "source": { "path": "child-opt-in-stack.template.json", "packaging": "file" @@ -23,7 +23,7 @@ "destinations": { "234567890123-af-south-1": { "bucketName": "cdk-hnb659fds-assets-234567890123-af-south-1", - "objectKey": "724fcbf9d2e61f5f01219e5ccf1893c6a7e501628b6b58e7f196e06a8ffc40a4.json", + "objectKey": "6d179d9e2df3b560501778a556c740c38cc7bb570462ba98f24a0ecc276c5979.json", "region": "af-south-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::234567890123:role/cdk-hnb659fds-file-publishing-role-234567890123-af-south-1" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.template.json index f7f290dc97527..154ebc04c51f5 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-opt-in-stack.template.json @@ -103,7 +103,7 @@ "Properties": { "Code": { "S3Bucket": "cdk-hnb659fds-assets-234567890123-af-south-1", - "S3Key": "2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7.zip" + "S3Key": "8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.assets.json index c8215193d39ba..d11d9d18ca1b2 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.assets.json @@ -1,21 +1,21 @@ { "version": "35.0.0", "files": { - "2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7": { + "8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a": { "source": { - "path": "asset.2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7", + "path": "asset.8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a", "packaging": "zip" }, "destinations": { "234567890123-us-east-1": { "bucketName": "cdk-hnb659fds-assets-234567890123-us-east-1", - "objectKey": "2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7.zip", + "objectKey": "8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a.zip", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::234567890123:role/cdk-hnb659fds-file-publishing-role-234567890123-us-east-1" } } }, - "f9bf49bbd725ecaa31a6ed5c97d7065bfa59fb5a31448ec069e2029c6e7a0b26": { + "fcdf10d0b55ed0b26eaa351d4c10e29d6e41d1a6b3a45893da6810ed9a91a0a2": { "source": { "path": "child-stack.template.json", "packaging": "file" @@ -23,7 +23,7 @@ "destinations": { "234567890123-us-east-1": { "bucketName": "cdk-hnb659fds-assets-234567890123-us-east-1", - "objectKey": "f9bf49bbd725ecaa31a6ed5c97d7065bfa59fb5a31448ec069e2029c6e7a0b26.json", + "objectKey": "fcdf10d0b55ed0b26eaa351d4c10e29d6e41d1a6b3a45893da6810ed9a91a0a2.json", "region": "us-east-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::234567890123:role/cdk-hnb659fds-file-publishing-role-234567890123-us-east-1" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.template.json index 5dbe7336da9ae..18d488b79c647 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/child-stack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-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": "2b579e92e62b1fec719d37bec6b4c9a853eb770a1ec95bbfb0cb301be93af3b7.zip" + "S3Key": "8b3eb4893317dd327e9817a7e5472f97fd34125627ca21ac8cd6b0303a869b9a.zip" }, "Timeout": 900, "MemorySize": 128, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/manifest.json index 2090bc5bc5a3e..617ec2dc08f59 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/manifest.json @@ -84,7 +84,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::234567890123:role/cdk-hnb659fds-deploy-role-234567890123-us-east-1", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::234567890123:role/cdk-hnb659fds-cfn-exec-role-234567890123-us-east-1", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-234567890123-us-east-1/f9bf49bbd725ecaa31a6ed5c97d7065bfa59fb5a31448ec069e2029c6e7a0b26.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-234567890123-us-east-1/fcdf10d0b55ed0b26eaa351d4c10e29d6e41d1a6b3a45893da6810ed9a91a0a2.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -163,7 +163,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::234567890123:role/cdk-hnb659fds-deploy-role-234567890123-af-south-1", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::234567890123:role/cdk-hnb659fds-cfn-exec-role-234567890123-af-south-1", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-234567890123-af-south-1/724fcbf9d2e61f5f01219e5ccf1893c6a7e501628b6b58e7f196e06a8ffc40a4.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-234567890123-af-south-1/6d179d9e2df3b560501778a556c740c38cc7bb570462ba98f24a0ecc276c5979.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/aws-cdk-lib/aws-route53/lib/cross-account-zone-delegation-handler/index.ts b/packages/@aws-cdk/custom-resource-handlers/lib/aws-route53/cross-account-zone-delegation-handler/index.ts similarity index 100% rename from packages/aws-cdk-lib/aws-route53/lib/cross-account-zone-delegation-handler/index.ts rename to packages/@aws-cdk/custom-resource-handlers/lib/aws-route53/cross-account-zone-delegation-handler/index.ts diff --git a/packages/aws-cdk-lib/aws-route53/test/cross-account-zone-delegation-handler/index.test.ts b/packages/@aws-cdk/custom-resource-handlers/test/aws-route53/cross-account-zone-delegation-handler.test.ts similarity index 98% rename from packages/aws-cdk-lib/aws-route53/test/cross-account-zone-delegation-handler/index.test.ts rename to packages/@aws-cdk/custom-resource-handlers/test/aws-route53/cross-account-zone-delegation-handler.test.ts index 8696c93c62d3b..d26356be46bbc 100644 --- a/packages/aws-cdk-lib/aws-route53/test/cross-account-zone-delegation-handler/index.test.ts +++ b/packages/@aws-cdk/custom-resource-handlers/test/aws-route53/cross-account-zone-delegation-handler.test.ts @@ -1,4 +1,4 @@ -import { handler } from '../../lib/cross-account-zone-delegation-handler'; +import { handler } from '../../lib/aws-route53/cross-account-zone-delegation-handler/index'; const mockAssumeRole = jest.fn(); const mockChangeResourceRecordSets = jest.fn(); diff --git a/packages/aws-cdk-lib/aws-route53/lib/cross-account-zone-delegation-handler/.is_custom_resource b/packages/aws-cdk-lib/aws-route53/lib/cross-account-zone-delegation-handler/.is_custom_resource deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/packages/aws-cdk-lib/aws-route53/lib/record-set.ts b/packages/aws-cdk-lib/aws-route53/lib/record-set.ts index d47f29f6b953b..f9f34f60e7fcd 100644 --- a/packages/aws-cdk-lib/aws-route53/lib/record-set.ts +++ b/packages/aws-cdk-lib/aws-route53/lib/record-set.ts @@ -774,7 +774,7 @@ export class CrossAccountZoneDelegationRecord extends Construct { } const provider = CustomResourceProvider.getOrCreateProvider(this, CROSS_ACCOUNT_ZONE_DELEGATION_RESOURCE_TYPE, { - codeDirectory: path.join(__dirname, 'cross-account-zone-delegation-handler'), + codeDirectory: path.join(__dirname, '..', '..', 'custom-resource-handlers', 'dist', 'aws-route53', 'cross-account-zone-delegation-handler'), runtime: CustomResourceProviderRuntime.NODEJS_18_X, });