@aws-cdk/toolkit-lib 1.1.0 → 1.1.1

package/package.json

@@ -34,7 +34,7 @@
     "organization": true
   },
   "devDependencies": {
-    "@aws-cdk/aws-service-spec": "^0.1.79",
+    "@aws-cdk/aws-service-spec": "^0.1.80",
     "@aws-cdk/cli-plugin-contract": "2.181.0",
     "@cdklabs/eslint-plugin": "^1.3.2",
     "@jest/environment": "^29.7.0",
@@ -50,7 +50,7 @@
     "@types/split2": "^4.2.3",
     "@typescript-eslint/eslint-plugin": "^8",
     "@typescript-eslint/parser": "^8",
-    "aws-cdk-lib": "^2.199.0",
+    "aws-cdk-lib": "^2.200.1",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "commit-and-tag-version": "^12",
@@ -59,7 +59,7 @@
     "eslint-config-prettier": "^10.1.5",
     "eslint-import-resolver-typescript": "^3.10.1",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^28.12.0",
+    "eslint-plugin-jest": "^28.13.0",
     "eslint-plugin-jsdoc": "^50.7.1",
     "eslint-plugin-prettier": "^5.4.1",
     "fast-check": "^4.1.1",
@@ -78,7 +78,7 @@
     "@aws-cdk/cli-plugin-contract": "^2"
   },
   "dependencies": {
-    "@aws-cdk/cloud-assembly-schema": ">=44.2.0",
+    "@aws-cdk/cloud-assembly-schema": ">=44.4.0",
     "@aws-cdk/cloudformation-diff": "^2",
     "@aws-cdk/cx-api": "^2",
     "@aws-sdk/client-appsync": "^3",
@@ -102,19 +102,19 @@
     "@aws-sdk/credential-providers": "^3",
     "@aws-sdk/ec2-metadata-service": "^3",
     "@aws-sdk/lib-storage": "^3",
-    "@smithy/middleware-endpoint": "^4.1.9",
+    "@smithy/middleware-endpoint": "^4.1.11",
     "@smithy/property-provider": "^4.0.4",
     "@smithy/shared-ini-file-loader": "^4.0.4",
     "@smithy/util-retry": "^4.0.5",
     "@smithy/util-waiter": "^4.0.5",
     "archiver": "^7.0.1",
     "cdk-assets": "^3",
-    "cdk-from-cfn": "^0.219.0",
+    "cdk-from-cfn": "^0.220.0",
     "chalk": "^4",
     "chokidar": "^3",
     "fs-extra": "^9",
     "glob": "^11.0.2",
-    "minimatch": "^10.0.1",
+    "minimatch": "10.0.1",
     "p-limit": "^3",
     "semver": "^7.7.2",
     "split2": "^4.2.0",
@@ -135,7 +135,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.1.0",
+  "version": "1.1.1",
   "types": "lib/index.d.ts",
   "exports": {
     ".": {

package/lib/api/refactoring/execution.js

@@ -1,68 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateStackDefinitions = generateStackDefinitions;
-const toolkit_error_1 = require("../../toolkit/toolkit-error");
-/**
- * Generates a list of stack definitions to be sent to the CloudFormation API
- * by applying each mapping to the corresponding stack template(s).
- */
-function generateStackDefinitions(mappings, deployedStacks, localStacks) {
-    const localTemplates = Object.fromEntries(localStacks.map((s) => [s.stackName, JSON.parse(JSON.stringify(s.template))]));
-    const deployedTemplates = Object.fromEntries(deployedStacks.map((s) => [s.stackName, JSON.parse(JSON.stringify(s.template))]));
-    // First, remove from the local templates any resources that are not in the deployed templates
-    iterate(localTemplates, (stackName, logicalResourceId) => {
-        const location = searchLocation(stackName, logicalResourceId, 'destination', 'source');
-        const deployedResource = deployedStacks.find((s) => s.stackName === location.stackName)?.template
-            .Resources?.[location.logicalResourceId];
-        if (deployedResource == null) {
-            delete localTemplates[stackName].Resources?.[logicalResourceId];
-        }
-    });
-    // Now do the opposite: add to the local templates any resources that are in the deployed templates
-    iterate(deployedTemplates, (stackName, logicalResourceId, deployedResource) => {
-        const location = searchLocation(stackName, logicalResourceId, 'source', 'destination');
-        const resources = Object
-            .entries(localTemplates)
-            .find(([name, _]) => name === location.stackName)?.[1].Resources;
-        const localResource = resources?.[location.logicalResourceId];
-        if (localResource == null) {
-            if (localTemplates[stackName]?.Resources) {
-                localTemplates[stackName].Resources[logicalResourceId] = deployedResource;
-            }
-        }
-        else {
-            // This is temporary, until CloudFormation supports CDK construct path updates in the refactor API
-            if (localResource.Metadata != null) {
-                localResource.Metadata['aws:cdk:path'] = deployedResource.Metadata?.['aws:cdk:path'];
-            }
-        }
-    });
-    function searchLocation(stackName, logicalResourceId, from, to) {
-        const mapping = mappings.find((m) => m[from].stack.stackName === stackName && m[from].logicalResourceId === logicalResourceId);
-        return mapping != null
-            ? { stackName: mapping[to].stack.stackName, logicalResourceId: mapping[to].logicalResourceId }
-            : { stackName, logicalResourceId };
-    }
-    function iterate(templates, cb) {
-        Object.entries(templates).forEach(([stackName, template]) => {
-            Object.entries(template.Resources ?? {}).forEach(([logicalResourceId, resource]) => {
-                cb(stackName, logicalResourceId, resource);
-            });
-        });
-    }
-    for (const [stackName, template] of Object.entries(localTemplates)) {
-        if (Object.keys(template.Resources ?? {}).length === 0) {
-            throw new toolkit_error_1.ToolkitError(`Stack ${stackName} has no resources after refactor. You must add a resource to this stack. This resource can be a simple one, like a waitCondition resource type.`);
-        }
-    }
-    return Object.entries(localTemplates)
-        .filter(([stackName, _]) => mappings.some((m) => {
-        // Only send templates for stacks that are part of the mappings
-        return m.source.stack.stackName === stackName || m.destination.stack.stackName === stackName;
-    }))
-        .map(([stackName, template]) => ({
-        StackName: stackName,
-        TemplateBody: JSON.stringify(template),
-    }));
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"execution.js","sourceRoot":"","sources":["execution.ts"],"names":[],"mappings":";;AAaA,4DAoFC;AA1FD,+DAA2D;AAE3D;;;GAGG;AACH,SAAgB,wBAAwB,CACtC,QAA2B,EAC3B,cAAqC,EACrC,WAAkC;IAElC,MAAM,cAAc,GAAG,MAAM,CAAC,WAAW,CACvC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAA2B,CAAC,CAAC,CACxG,CAAC;IACF,MAAM,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAC1C,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAA2B,CAAC,CAAC,CAC3G,CAAC;IAEF,8FAA8F;IAC9F,OAAO,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE,iBAAiB,EAAE,EAAE;QACvD,MAAM,QAAQ,GAAG,cAAc,CAAC,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QAEvF,MAAM,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ;aAC9F,SAAS,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAE3C,IAAI,gBAAgB,IAAI,IAAI,EAAE,CAAC;YAC7B,OAAO,cAAc,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,CAAC;QAClE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,mGAAmG;IACnG,OAAO,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,EAAE;QAC5E,MAAM,QAAQ,GAAG,cAAc,CAAC,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QAEvF,MAAM,SAAS,GAAG,MAAM;aACrB,OAAO,CAAC,cAAc,CAAC;aACvB,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAE9D,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;YAC1B,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC;gBACzC,cAAc,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC;YAC5E,CAAC;QACH,CAAC;aAAM,CAAC;YACN,kGAAkG;YAClG,IAAI,aAAa,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACnC,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC,cAAc,CAAC,CAAC;YACvF,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,SAAS,cAAc,CAAC,SAAiB,EAAE,iBAAyB,EAAE,IAA8B,EAAE,EAA4B;QAChI,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAC3B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,iBAAiB,KAAK,iBAAiB,CAChG,CAAC;QACF,OAAO,OAAO,IAAI,IAAI;YACpB,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,EAAE;YAC9F,CAAC,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;IACvC,CAAC;IAED,SAAS,OAAO,CACd,SAAiD,EACjD,EAA4F;QAE5F,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE;YAC1D,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,EAAE;gBACjF,EAAE,CAAC,SAAS,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;QACnE,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,4BAAY,CACpB,SAAS,SAAS,iJAAiJ,CACpK,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC;SAClC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CACzB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,+DAA+D;QAC/D,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC;IAC/F,CAAC,CAAC,CACH;SACA,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/B,SAAS,EAAE,SAAS;QACpB,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;KACvC,CAAC,CAAC,CAAC;AACR,CAAC","sourcesContent":["import type { StackDefinition } from '@aws-sdk/client-cloudformation';\nimport type {\n  CloudFormationResource,\n  CloudFormationStack,\n  CloudFormationTemplate,\n  ResourceMapping,\n} from './cloudformation';\nimport { ToolkitError } from '../../toolkit/toolkit-error';\n\n/**\n * Generates a list of stack definitions to be sent to the CloudFormation API\n * by applying each mapping to the corresponding stack template(s).\n */\nexport function generateStackDefinitions(\n  mappings: ResourceMapping[],\n  deployedStacks: CloudFormationStack[],\n  localStacks: CloudFormationStack[],\n): StackDefinition[] {\n  const localTemplates = Object.fromEntries(\n    localStacks.map((s) => [s.stackName, JSON.parse(JSON.stringify(s.template)) as CloudFormationTemplate]),\n  );\n  const deployedTemplates = Object.fromEntries(\n    deployedStacks.map((s) => [s.stackName, JSON.parse(JSON.stringify(s.template)) as CloudFormationTemplate]),\n  );\n\n  // First, remove from the local templates any resources that are not in the deployed templates\n  iterate(localTemplates, (stackName, logicalResourceId) => {\n    const location = searchLocation(stackName, logicalResourceId, 'destination', 'source');\n\n    const deployedResource = deployedStacks.find((s) => s.stackName === location.stackName)?.template\n      .Resources?.[location.logicalResourceId];\n\n    if (deployedResource == null) {\n      delete localTemplates[stackName].Resources?.[logicalResourceId];\n    }\n  });\n\n  // Now do the opposite: add to the local templates any resources that are in the deployed templates\n  iterate(deployedTemplates, (stackName, logicalResourceId, deployedResource) => {\n    const location = searchLocation(stackName, logicalResourceId, 'source', 'destination');\n\n    const resources = Object\n      .entries(localTemplates)\n      .find(([name, _]) => name === location.stackName)?.[1].Resources;\n    const localResource = resources?.[location.logicalResourceId];\n\n    if (localResource == null) {\n      if (localTemplates[stackName]?.Resources) {\n        localTemplates[stackName].Resources[logicalResourceId] = deployedResource;\n      }\n    } else {\n      // This is temporary, until CloudFormation supports CDK construct path updates in the refactor API\n      if (localResource.Metadata != null) {\n        localResource.Metadata['aws:cdk:path'] = deployedResource.Metadata?.['aws:cdk:path'];\n      }\n    }\n  });\n\n  function searchLocation(stackName: string, logicalResourceId: string, from: 'source' | 'destination', to: 'source' | 'destination') {\n    const mapping = mappings.find(\n      (m) => m[from].stack.stackName === stackName && m[from].logicalResourceId === logicalResourceId,\n    );\n    return mapping != null\n      ? { stackName: mapping[to].stack.stackName, logicalResourceId: mapping[to].logicalResourceId }\n      : { stackName, logicalResourceId };\n  }\n\n  function iterate(\n    templates: Record<string, CloudFormationTemplate>,\n    cb: (stackName: string, logicalResourceId: string, resource: CloudFormationResource) => void,\n  ) {\n    Object.entries(templates).forEach(([stackName, template]) => {\n      Object.entries(template.Resources ?? {}).forEach(([logicalResourceId, resource]) => {\n        cb(stackName, logicalResourceId, resource);\n      });\n    });\n  }\n\n  for (const [stackName, template] of Object.entries(localTemplates)) {\n    if (Object.keys(template.Resources ?? {}).length === 0) {\n      throw new ToolkitError(\n        `Stack ${stackName} has no resources after refactor. You must add a resource to this stack. This resource can be a simple one, like a waitCondition resource type.`,\n      );\n    }\n  }\n\n  return Object.entries(localTemplates)\n    .filter(([stackName, _]) =>\n      mappings.some((m) => {\n        // Only send templates for stacks that are part of the mappings\n        return m.source.stack.stackName === stackName || m.destination.stack.stackName === stackName;\n      }),\n    )\n    .map(([stackName, template]) => ({\n      StackName: stackName,\n      TemplateBody: JSON.stringify(template),\n    }));\n}\n"]}