@aws/nx-plugin 1.0.0-rc.96 → 1.0.0-rc.97

package/src/migrations/latest/gateway-url-accessor/migration.js

@@ -0,0 +1,94 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { applyGritQL, GRIT_INSERT_PLACEHOLDER, insertViaGritQL, matchGritQL } from "../../../utils/ast.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { PACKAGES_DIR, SHARED_CONSTRUCTS_DIR } from "../../../utils/shared-constructs-constants.js";
+/**
+ * The CDK `Gateway` L2 types its `gatewayUrl` as `string | undefined`, so
+ * reaching through the vended `AgentCoreGateway` construct to
+ * `gateway.gateway.gatewayUrl` does not typecheck where a `string` is required —
+ * the DCR proxy's `upstreamUrl`, for example. `AgentCoreGateway` gains a
+ * non-optional `gatewayUrl` accessor falling back to the CloudFormation
+ * attribute, which `addGateway` and the vended app-level gateway constructs then
+ * read.
+ */ const CONSTRUCTS_SRC = `${PACKAGES_DIR}/${SHARED_CONSTRUCTS_DIR}/src`;
+const GATEWAY_CONSTRUCT_FILE = `${CONSTRUCTS_SRC}/core/agentcore-gateway/agentcore-gateway.ts`;
+const GATEWAYS_DIR = `${CONSTRUCTS_SRC}/app/gateways`;
+const GATEWAY_URL_ACCESSOR = `/**
+   * The gateway's URL endpoint. The Gateway L2 types its own \`gatewayUrl\` as
+   * optional and only populates it when created from its own props, so fall
+   * back to the CloudFormation attribute.
+   */
+  public get gatewayUrl(): string {
+    return (
+      this.gateway.gatewayUrl ??
+      (this.gateway.node.defaultChild as agentcore.CfnGateway).attrGatewayUrl
+    );
+  }`;
+const divergedCoreMessage = `${GATEWAY_CONSTRUCT_FILE}: the AgentCoreGateway construct has diverged from the generated shape - left untouched. To use a gateway's URL where a \`string\` is required, add a \`public get gatewayUrl(): string\` accessor returning \`this.gateway.gatewayUrl ?? (this.gateway.node.defaultChild as agentcore.CfnGateway).attrGatewayUrl\`.`;
+/**
+ * Add the `gatewayUrl` accessor to the vended core construct, and route
+ * `addGateway` and the shape it requires of its argument through it. Returns
+ * whether the core construct ends up carrying the accessor — app-level
+ * constructs may only be pointed at it once it exists.
+ */ const migrateCoreConstruct = async (tree, nextSteps)=>{
+    if (!tree.exists(GATEWAY_CONSTRUCT_FILE)) {
+        return false;
+    }
+    const hasAccessor = await matchGritQL(tree, GATEWAY_CONSTRUCT_FILE, '`public get gatewayUrl(): string { $_ }`');
+    if (!hasAccessor) {
+        // Anchored on the grantPrincipal accessor, present in every vended version.
+        const added = await insertViaGritQL(tree, GATEWAY_CONSTRUCT_FILE, `\`public get grantPrincipal(): iam.IPrincipal { $body }\` as $accessor => \`$accessor
+
+  ${GRIT_INSERT_PLACEHOLDER}\``, GATEWAY_URL_ACCESSOR);
+        if (!added) {
+            nextSteps.push(divergedCoreMessage);
+            return false;
+        }
+    }
+    const addGatewayUsesAccessor = await matchGritQL(tree, GATEWAY_CONSTRUCT_FILE, '`gatewayUrl: gateway.gatewayUrl`');
+    if (!addGatewayUsesAccessor) {
+        // The accessor is part of the shape addGateway requires of its argument.
+        await applyGritQL(tree, GATEWAY_CONSTRUCT_FILE, `\`readonly gatewayName: string\` as $member => \`$member;
+      readonly gatewayUrl: string\``);
+        // addGateway reads the accessor rather than repeating the fallback inline.
+        await applyGritQL(tree, GATEWAY_CONSTRUCT_FILE, `\`this.addGatewayTarget({ gatewayTargetName: $name, gatewayUrl: $url, gatewayArn: $arn })\` where {
+  $url <: contains \`attrGatewayUrl\`
+} => \`this.addGatewayTarget({
+      gatewayTargetName: $name,
+      gatewayUrl: gateway.gatewayUrl,
+      gatewayArn: $arn,
+    })\``);
+    }
+    return true;
+};
+/**
+ * Point each vended app-level gateway construct's runtime config entry at the
+ * accessor.
+ */ const migrateAppConstructs = async (tree)=>{
+    if (!tree.exists(GATEWAYS_DIR)) {
+        return;
+    }
+    for (const dir of tree.children(GATEWAYS_DIR)){
+        const constructFile = `${GATEWAYS_DIR}/${dir}/${dir}.ts`;
+        if (!tree.exists(constructFile)) {
+            continue;
+        }
+        await applyGritQL(tree, constructFile, '`this.gateway.gatewayUrl` => `this.gatewayUrl`');
+    }
+};
+export default async function migration(tree) {
+    const nextSteps = [];
+    // The app constructs read the accessor, so they may only be migrated once the
+    // core construct carries it.
+    if (await migrateCoreConstruct(tree, nextSteps)) {
+        await migrateAppConstructs(tree);
+    }
+    await formatFilesInSubtree(tree);
+    return {
+        nextSteps
+    };
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/latest/gateway-url-accessor/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/gateway-url-accessor/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { MigrationReturnObject, Tree } from '@nx/devkit';\nimport {\n  applyGritQL,\n  GRIT_INSERT_PLACEHOLDER,\n  insertViaGritQL,\n  matchGritQL,\n} from '../../../utils/ast.js';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n} from '../../../utils/shared-constructs-constants.js';\n\n/**\n * The CDK `Gateway` L2 types its `gatewayUrl` as `string | undefined`, so\n * reaching through the vended `AgentCoreGateway` construct to\n * `gateway.gateway.gatewayUrl` does not typecheck where a `string` is required —\n * the DCR proxy's `upstreamUrl`, for example. `AgentCoreGateway` gains a\n * non-optional `gatewayUrl` accessor falling back to the CloudFormation\n * attribute, which `addGateway` and the vended app-level gateway constructs then\n * read.\n */\n\nconst CONSTRUCTS_SRC = `${PACKAGES_DIR}/${SHARED_CONSTRUCTS_DIR}/src`;\n\nconst GATEWAY_CONSTRUCT_FILE = `${CONSTRUCTS_SRC}/core/agentcore-gateway/agentcore-gateway.ts`;\n\nconst GATEWAYS_DIR = `${CONSTRUCTS_SRC}/app/gateways`;\n\nconst GATEWAY_URL_ACCESSOR = `/**\n   * The gateway's URL endpoint. The Gateway L2 types its own \\`gatewayUrl\\` as\n   * optional and only populates it when created from its own props, so fall\n   * back to the CloudFormation attribute.\n   */\n  public get gatewayUrl(): string {\n    return (\n      this.gateway.gatewayUrl ??\n      (this.gateway.node.defaultChild as agentcore.CfnGateway).attrGatewayUrl\n    );\n  }`;\n\nconst divergedCoreMessage = `${GATEWAY_CONSTRUCT_FILE}: the AgentCoreGateway construct has diverged from the generated shape - left untouched. To use a gateway's URL where a \\`string\\` is required, add a \\`public get gatewayUrl(): string\\` accessor returning \\`this.gateway.gatewayUrl ?? (this.gateway.node.defaultChild as agentcore.CfnGateway).attrGatewayUrl\\`.`;\n\n/**\n * Add the `gatewayUrl` accessor to the vended core construct, and route\n * `addGateway` and the shape it requires of its argument through it. Returns\n * whether the core construct ends up carrying the accessor — app-level\n * constructs may only be pointed at it once it exists.\n */\nconst migrateCoreConstruct = async (\n  tree: Tree,\n  nextSteps: string[],\n): Promise<boolean> => {\n  if (!tree.exists(GATEWAY_CONSTRUCT_FILE)) {\n    return false;\n  }\n\n  const hasAccessor = await matchGritQL(\n    tree,\n    GATEWAY_CONSTRUCT_FILE,\n    '`public get gatewayUrl(): string { $_ }`',\n  );\n\n  if (!hasAccessor) {\n    // Anchored on the grantPrincipal accessor, present in every vended version.\n    const added = await insertViaGritQL(\n      tree,\n      GATEWAY_CONSTRUCT_FILE,\n      `\\`public get grantPrincipal(): iam.IPrincipal { $body }\\` as $accessor => \\`$accessor\n\n  ${GRIT_INSERT_PLACEHOLDER}\\``,\n      GATEWAY_URL_ACCESSOR,\n    );\n    if (!added) {\n      nextSteps.push(divergedCoreMessage);\n      return false;\n    }\n  }\n\n  const addGatewayUsesAccessor = await matchGritQL(\n    tree,\n    GATEWAY_CONSTRUCT_FILE,\n    '`gatewayUrl: gateway.gatewayUrl`',\n  );\n\n  if (!addGatewayUsesAccessor) {\n    // The accessor is part of the shape addGateway requires of its argument.\n    await applyGritQL(\n      tree,\n      GATEWAY_CONSTRUCT_FILE,\n      `\\`readonly gatewayName: string\\` as $member => \\`$member;\n      readonly gatewayUrl: string\\``,\n    );\n\n    // addGateway reads the accessor rather than repeating the fallback inline.\n    await applyGritQL(\n      tree,\n      GATEWAY_CONSTRUCT_FILE,\n      `\\`this.addGatewayTarget({ gatewayTargetName: $name, gatewayUrl: $url, gatewayArn: $arn })\\` where {\n  $url <: contains \\`attrGatewayUrl\\`\n} => \\`this.addGatewayTarget({\n      gatewayTargetName: $name,\n      gatewayUrl: gateway.gatewayUrl,\n      gatewayArn: $arn,\n    })\\``,\n    );\n  }\n\n  return true;\n};\n\n/**\n * Point each vended app-level gateway construct's runtime config entry at the\n * accessor.\n */\nconst migrateAppConstructs = async (tree: Tree): Promise<void> => {\n  if (!tree.exists(GATEWAYS_DIR)) {\n    return;\n  }\n  for (const dir of tree.children(GATEWAYS_DIR)) {\n    const constructFile = `${GATEWAYS_DIR}/${dir}/${dir}.ts`;\n    if (!tree.exists(constructFile)) {\n      continue;\n    }\n    await applyGritQL(\n      tree,\n      constructFile,\n      '`this.gateway.gatewayUrl` => `this.gatewayUrl`',\n    );\n  }\n};\n\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [];\n\n  // The app constructs read the accessor, so they may only be migrated once the\n  // core construct carries it.\n  if (await migrateCoreConstruct(tree, nextSteps)) {\n    await migrateAppConstructs(tree);\n  }\n\n  await formatFilesInSubtree(tree);\n\n  return { nextSteps };\n}\n"],"names":["applyGritQL","GRIT_INSERT_PLACEHOLDER","insertViaGritQL","matchGritQL","formatFilesInSubtree","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","CONSTRUCTS_SRC","GATEWAY_CONSTRUCT_FILE","GATEWAYS_DIR","GATEWAY_URL_ACCESSOR","divergedCoreMessage","migrateCoreConstruct","tree","nextSteps","exists","hasAccessor","added","push","addGatewayUsesAccessor","migrateAppConstructs","dir","children","constructFile","migration"],"mappings":"AAAA;;;CAGC,GAED,SACEA,WAAW,EACXC,uBAAuB,EACvBC,eAAe,EACfC,WAAW,QACN,wBAAwB;AAC/B,SAASC,oBAAoB,QAAQ,2BAA2B;AAChE,SACEC,YAAY,EACZC,qBAAqB,QAChB,gDAAgD;AAEvD;;;;;;;;CAQC,GAED,MAAMC,iBAAiB,GAAGF,aAAa,CAAC,EAAEC,sBAAsB,IAAI,CAAC;AAErE,MAAME,yBAAyB,GAAGD,eAAe,4CAA4C,CAAC;AAE9F,MAAME,eAAe,GAAGF,eAAe,aAAa,CAAC;AAErD,MAAMG,uBAAuB,CAAC;;;;;;;;;;GAU3B,CAAC;AAEJ,MAAMC,sBAAsB,GAAGH,uBAAuB,oTAAoT,CAAC;AAE3W;;;;;CAKC,GACD,MAAMI,uBAAuB,OAC3BC,MACAC;IAEA,IAAI,CAACD,KAAKE,MAAM,CAACP,yBAAyB;QACxC,OAAO;IACT;IAEA,MAAMQ,cAAc,MAAMb,YACxBU,MACAL,wBACA;IAGF,IAAI,CAACQ,aAAa;QAChB,4EAA4E;QAC5E,MAAMC,QAAQ,MAAMf,gBAClBW,MACAL,wBACA,CAAC;;EAEL,EAAEP,wBAAwB,EAAE,CAAC,EACzBS;QAEF,IAAI,CAACO,OAAO;YACVH,UAAUI,IAAI,CAACP;YACf,OAAO;QACT;IACF;IAEA,MAAMQ,yBAAyB,MAAMhB,YACnCU,MACAL,wBACA;IAGF,IAAI,CAACW,wBAAwB;QAC3B,yEAAyE;QACzE,MAAMnB,YACJa,MACAL,wBACA,CAAC;mCAC4B,CAAC;QAGhC,2EAA2E;QAC3E,MAAMR,YACJa,MACAL,wBACA,CAAC;;;;;;QAMC,CAAC;IAEP;IAEA,OAAO;AACT;AAEA;;;CAGC,GACD,MAAMY,uBAAuB,OAAOP;IAClC,IAAI,CAACA,KAAKE,MAAM,CAACN,eAAe;QAC9B;IACF;IACA,KAAK,MAAMY,OAAOR,KAAKS,QAAQ,CAACb,cAAe;QAC7C,MAAMc,gBAAgB,GAAGd,aAAa,CAAC,EAAEY,IAAI,CAAC,EAAEA,IAAI,GAAG,CAAC;QACxD,IAAI,CAACR,KAAKE,MAAM,CAACQ,gBAAgB;YAC/B;QACF;QACA,MAAMvB,YACJa,MACAU,eACA;IAEJ;AACF;AAEA,eAAe,eAAeC,UAC5BX,IAAU;IAEV,MAAMC,YAAsB,EAAE;IAE9B,8EAA8E;IAC9E,6BAA6B;IAC7B,IAAI,MAAMF,qBAAqBC,MAAMC,YAAY;QAC/C,MAAMM,qBAAqBP;IAC7B;IAEA,MAAMT,qBAAqBS;IAE3B,OAAO;QAAEC;IAAU;AACrB"}

package/src/migrations/latest/infra-deploy-express-mode/metadata.json

@@ -1,3 +1,3 @@
 {
-  "description": "Deploy using CloudFormation express mode from the deploy and deploy-sandbox targets of ts#infra projects"
+  "description": "Deploy using CloudFormation express mode from the deploy-sandbox target of ts#infra projects, and wait for full stabilization from deploy"
 }

package/src/migrations/latest/infra-deploy-express-mode/migration.js

@@ -5,29 +5,31 @@
 import { INFRA_APP_GENERATOR_INFO } from "../../../infra/app/generator.js";
 import { formatFilesInSubtree } from "../../../utils/format.js";
 /**
- * Deploy using CloudFormation express mode from the deploy and deploy-sandbox
- * targets of ts#infra projects
+ * Deploy using CloudFormation express mode from the deploy-sandbox target of
+ * ts#infra projects, and wait for full stabilization everywhere else.
  *
- * Express mode completes each resource operation as soon as its configuration
- * is applied rather than waiting for full stabilization, which is a much faster
- * iteration cycle for development deploys.
+ * Express mode completes each resource operation as soon as its configuration is
+ * applied rather than waiting for full stabilization, which is a much faster
+ * iteration cycle for development deploys. It returns before resources have
+ * settled, so it suits only the stage you iterate on.
  *
- * Two targets keep waiting for full stabilization: `deploy-ci`, since pipeline
- * deployments should never skip it, and - when stages are configured - `deploy`,
- * which deploys whichever stage is named, including beta and prod.
- */ const DEPLOY_TARGETS = [
-    'deploy',
-    'deploy-sandbox'
-];
-const EXPRESS_FLAG = '--express';
+ * `deploy-sandbox` therefore gets it, since it only ever deploys the sandbox
+ * stage. `deploy` names whichever stage you give it, including beta and prod, and
+ * `deploy-ci` runs from a pipeline - both wait for full stabilization.
+ */ const EXPRESS_FLAG = '--express';
+const NO_EXPRESS_FLAG = '--no-express';
+/** Whether `deploy-sandbox` should carry the flag, and `deploy` should not. */ const WANTS_EXPRESS = {
+    'deploy-sandbox': true,
+    deploy: false
+};
 /**
  * Whether the command is one of the deploy commands this migration vends -
  * either a direct `cdk deploy`, or the stage-config `infra-deploy.ts` script
  * that wraps it. Anything else has been hand-written and is reported rather
  * than rewritten.
  */ const isGeneratedDeployCommand = (command)=>/(^|\s)cdk\s+deploy(\s|$)/.test(command) || command.includes('infra-deploy.ts');
-/** Whether the command runs the stage-config deploy script. */ const isStageConfigDeploy = (command)=>command.includes('infra-deploy.ts');
-const divergedNextStep = (projectName, target)=>`${projectName}: its ${target} target has been customised, so it was left as it is. Add "${EXPRESS_FLAG}" to the target's command to deploy using CloudFormation express mode.`;
+const divergedNextStep = (projectName, target, wantsExpress)=>wantsExpress ? `${projectName}: its ${target} target has been customised, so it was left as it is. Add "${EXPRESS_FLAG}" to the target's command to deploy using CloudFormation express mode.` : `${projectName}: its ${target} target has been customised, so it was left as it is. Remove "${EXPRESS_FLAG}" from the target's command so it waits for full resource stabilization - this target can name any stage, including production.`;
+/** Drops the flag wherever it sits, leaving the rest of the command untouched. */ const withoutExpress = (command)=>command.split(/\s+/).filter((arg)=>arg !== EXPRESS_FLAG).join(' ');
 export default async function migration(tree) {
     const nextSteps = [];
     let migrated = false;
@@ -36,35 +38,31 @@ export default async function migration(tree) {
             continue;
         }
         let projectChanged = false;
-        for (const targetName of DEPLOY_TARGETS){
+        for (const [targetName, wantsExpress] of Object.entries(WANTS_EXPRESS)){
             const target = project.targets?.[targetName];
             const command = target?.options?.command;
             if (!target || typeof command !== 'string') {
                 continue;
             }
-            // Already migrated (or generated by a version that already passes it) -
-            // skip so re-running is a no-op.
-            if (command.split(/\s+/).includes(EXPRESS_FLAG)) {
+            const args = command.split(/\s+/);
+            const hasExpress = args.includes(EXPRESS_FLAG);
+            // Already in the wanted state, so re-running - and a project generated
+            // after this change - is a no-op.
+            if (hasExpress === wantsExpress) {
                 continue;
             }
             // `--no-express` is a deliberate opt-out, so honour it rather than
             // flipping the user back to express mode.
-            if (command.split(/\s+/).includes('--no-express')) {
+            if (wantsExpress && args.includes(NO_EXPRESS_FLAG)) {
                 continue;
             }
             if (!isGeneratedDeployCommand(command)) {
-                nextSteps.push(divergedNextStep(name, targetName));
-                continue;
-            }
-            // When stages are configured, `deploy` deploys whichever stage is named,
-            // including beta and prod, so it stays on full stabilization. Only its
-            // sandbox counterpart opts into express mode.
-            if (targetName === 'deploy' && isStageConfigDeploy(command)) {
+                nextSteps.push(divergedNextStep(name, targetName, wantsExpress));
                 continue;
             }
             // Appended last so it stays clear of the stage pattern, which the
             // stage-config deploy script reads from the first positional argument.
-            target.options.command = `${command} ${EXPRESS_FLAG}`;
+            target.options.command = wantsExpress ? `${command} ${EXPRESS_FLAG}` : withoutExpress(command);
             projectChanged = true;
         }
         if (projectChanged) {

package/src/migrations/latest/infra-deploy-express-mode/migration.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/infra-deploy-express-mode/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  getProjects,\n  type MigrationReturnObject,\n  type TargetConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { INFRA_APP_GENERATOR_INFO } from '../../../infra/app/generator.js';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\n\n/**\n * Deploy using CloudFormation express mode from the deploy and deploy-sandbox\n * targets of ts#infra projects\n *\n * Express mode completes each resource operation as soon as its configuration\n * is applied rather than waiting for full stabilization, which is a much faster\n * iteration cycle for development deploys.\n *\n * Two targets keep waiting for full stabilization: `deploy-ci`, since pipeline\n * deployments should never skip it, and - when stages are configured - `deploy`,\n * which deploys whichever stage is named, including beta and prod.\n */\n\nconst DEPLOY_TARGETS = ['deploy', 'deploy-sandbox'];\n\nconst EXPRESS_FLAG = '--express';\n\n/**\n * Whether the command is one of the deploy commands this migration vends -\n * either a direct `cdk deploy`, or the stage-config `infra-deploy.ts` script\n * that wraps it. Anything else has been hand-written and is reported rather\n * than rewritten.\n */\nconst isGeneratedDeployCommand = (command: string): boolean =>\n  /(^|\\s)cdk\\s+deploy(\\s|$)/.test(command) ||\n  command.includes('infra-deploy.ts');\n\n/** Whether the command runs the stage-config deploy script. */\nconst isStageConfigDeploy = (command: string): boolean =>\n  command.includes('infra-deploy.ts');\n\nconst divergedNextStep = (projectName: string, target: string): string =>\n  `${projectName}: its ${target} target has been customised, so it was left as it is. Add \"${EXPRESS_FLAG}\" to the target's command to deploy using CloudFormation express mode.`;\n\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [];\n  let migrated = false;\n\n  for (const [name, project] of getProjects(tree)) {\n    if (\n      (project.metadata as { generator?: string } | undefined)?.generator !==\n      INFRA_APP_GENERATOR_INFO.id\n    ) {\n      continue;\n    }\n\n    let projectChanged = false;\n\n    for (const targetName of DEPLOY_TARGETS) {\n      const target: TargetConfiguration | undefined =\n        project.targets?.[targetName];\n      const command = target?.options?.command;\n      if (!target || typeof command !== 'string') {\n        continue;\n      }\n\n      // Already migrated (or generated by a version that already passes it) -\n      // skip so re-running is a no-op.\n      if (command.split(/\\s+/).includes(EXPRESS_FLAG)) {\n        continue;\n      }\n\n      // `--no-express` is a deliberate opt-out, so honour it rather than\n      // flipping the user back to express mode.\n      if (command.split(/\\s+/).includes('--no-express')) {\n        continue;\n      }\n\n      if (!isGeneratedDeployCommand(command)) {\n        nextSteps.push(divergedNextStep(name, targetName));\n        continue;\n      }\n\n      // When stages are configured, `deploy` deploys whichever stage is named,\n      // including beta and prod, so it stays on full stabilization. Only its\n      // sandbox counterpart opts into express mode.\n      if (targetName === 'deploy' && isStageConfigDeploy(command)) {\n        continue;\n      }\n\n      // Appended last so it stays clear of the stage pattern, which the\n      // stage-config deploy script reads from the first positional argument.\n      target.options.command = `${command} ${EXPRESS_FLAG}`;\n      projectChanged = true;\n    }\n\n    if (projectChanged) {\n      updateProjectConfiguration(tree, name, project);\n      migrated = true;\n    }\n  }\n\n  if (migrated) {\n    await formatFilesInSubtree(tree);\n  }\n\n  return { nextSteps };\n}\n"],"names":["getProjects","updateProjectConfiguration","INFRA_APP_GENERATOR_INFO","formatFilesInSubtree","DEPLOY_TARGETS","EXPRESS_FLAG","isGeneratedDeployCommand","command","test","includes","isStageConfigDeploy","divergedNextStep","projectName","target","migration","tree","nextSteps","migrated","name","project","metadata","generator","id","projectChanged","targetName","targets","options","split","push"],"mappings":"AAAA;;;CAGC,GACD,SACEA,WAAW,EAIXC,0BAA0B,QACrB,aAAa;AACpB,SAASC,wBAAwB,QAAQ,kCAAkC;AAC3E,SAASC,oBAAoB,QAAQ,2BAA2B;AAEhE;;;;;;;;;;;CAWC,GAED,MAAMC,iBAAiB;IAAC;IAAU;CAAiB;AAEnD,MAAMC,eAAe;AAErB;;;;;CAKC,GACD,MAAMC,2BAA2B,CAACC,UAChC,2BAA2BC,IAAI,CAACD,YAChCA,QAAQE,QAAQ,CAAC;AAEnB,6DAA6D,GAC7D,MAAMC,sBAAsB,CAACH,UAC3BA,QAAQE,QAAQ,CAAC;AAEnB,MAAME,mBAAmB,CAACC,aAAqBC,SAC7C,GAAGD,YAAY,MAAM,EAAEC,OAAO,2DAA2D,EAAER,aAAa,sEAAsE,CAAC;AAEjL,eAAe,eAAeS,UAC5BC,IAAU;IAEV,MAAMC,YAAsB,EAAE;IAC9B,IAAIC,WAAW;IAEf,KAAK,MAAM,CAACC,MAAMC,QAAQ,IAAInB,YAAYe,MAAO;QAC/C,IACE,AAACI,QAAQC,QAAQ,EAAyCC,cAC1DnB,yBAAyBoB,EAAE,EAC3B;YACA;QACF;QAEA,IAAIC,iBAAiB;QAErB,KAAK,MAAMC,cAAcpB,eAAgB;YACvC,MAAMS,SACJM,QAAQM,OAAO,EAAE,CAACD,WAAW;YAC/B,MAAMjB,UAAUM,QAAQa,SAASnB;YACjC,IAAI,CAACM,UAAU,OAAON,YAAY,UAAU;gBAC1C;YACF;YAEA,wEAAwE;YACxE,iCAAiC;YACjC,IAAIA,QAAQoB,KAAK,CAAC,OAAOlB,QAAQ,CAACJ,eAAe;gBAC/C;YACF;YAEA,mEAAmE;YACnE,0CAA0C;YAC1C,IAAIE,QAAQoB,KAAK,CAAC,OAAOlB,QAAQ,CAAC,iBAAiB;gBACjD;YACF;YAEA,IAAI,CAACH,yBAAyBC,UAAU;gBACtCS,UAAUY,IAAI,CAACjB,iBAAiBO,MAAMM;gBACtC;YACF;YAEA,yEAAyE;YACzE,uEAAuE;YACvE,8CAA8C;YAC9C,IAAIA,eAAe,YAAYd,oBAAoBH,UAAU;gBAC3D;YACF;YAEA,kEAAkE;YAClE,uEAAuE;YACvEM,OAAOa,OAAO,CAACnB,OAAO,GAAG,GAAGA,QAAQ,CAAC,EAAEF,cAAc;YACrDkB,iBAAiB;QACnB;QAEA,IAAIA,gBAAgB;YAClBtB,2BAA2Bc,MAAMG,MAAMC;YACvCF,WAAW;QACb;IACF;IAEA,IAAIA,UAAU;QACZ,MAAMd,qBAAqBY;IAC7B;IAEA,OAAO;QAAEC;IAAU;AACrB"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/infra-deploy-express-mode/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  getProjects,\n  type MigrationReturnObject,\n  type TargetConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { INFRA_APP_GENERATOR_INFO } from '../../../infra/app/generator.js';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\n\n/**\n * Deploy using CloudFormation express mode from the deploy-sandbox target of\n * ts#infra projects, and wait for full stabilization everywhere else.\n *\n * Express mode completes each resource operation as soon as its configuration is\n * applied rather than waiting for full stabilization, which is a much faster\n * iteration cycle for development deploys. It returns before resources have\n * settled, so it suits only the stage you iterate on.\n *\n * `deploy-sandbox` therefore gets it, since it only ever deploys the sandbox\n * stage. `deploy` names whichever stage you give it, including beta and prod, and\n * `deploy-ci` runs from a pipeline - both wait for full stabilization.\n */\n\nconst EXPRESS_FLAG = '--express';\nconst NO_EXPRESS_FLAG = '--no-express';\n\n/** Whether `deploy-sandbox` should carry the flag, and `deploy` should not. */\nconst WANTS_EXPRESS: Record<string, boolean> = {\n  'deploy-sandbox': true,\n  deploy: false,\n};\n\n/**\n * Whether the command is one of the deploy commands this migration vends -\n * either a direct `cdk deploy`, or the stage-config `infra-deploy.ts` script\n * that wraps it. Anything else has been hand-written and is reported rather\n * than rewritten.\n */\nconst isGeneratedDeployCommand = (command: string): boolean =>\n  /(^|\\s)cdk\\s+deploy(\\s|$)/.test(command) ||\n  command.includes('infra-deploy.ts');\n\nconst divergedNextStep = (\n  projectName: string,\n  target: string,\n  wantsExpress: boolean,\n): string =>\n  wantsExpress\n    ? `${projectName}: its ${target} target has been customised, so it was left as it is. Add \"${EXPRESS_FLAG}\" to the target's command to deploy using CloudFormation express mode.`\n    : `${projectName}: its ${target} target has been customised, so it was left as it is. Remove \"${EXPRESS_FLAG}\" from the target's command so it waits for full resource stabilization - this target can name any stage, including production.`;\n\n/** Drops the flag wherever it sits, leaving the rest of the command untouched. */\nconst withoutExpress = (command: string): string =>\n  command\n    .split(/\\s+/)\n    .filter((arg) => arg !== EXPRESS_FLAG)\n    .join(' ');\n\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [];\n  let migrated = false;\n\n  for (const [name, project] of getProjects(tree)) {\n    if (\n      (project.metadata as { generator?: string } | undefined)?.generator !==\n      INFRA_APP_GENERATOR_INFO.id\n    ) {\n      continue;\n    }\n\n    let projectChanged = false;\n\n    for (const [targetName, wantsExpress] of Object.entries(WANTS_EXPRESS)) {\n      const target: TargetConfiguration | undefined =\n        project.targets?.[targetName];\n      const command = target?.options?.command;\n      if (!target || typeof command !== 'string') {\n        continue;\n      }\n\n      const args = command.split(/\\s+/);\n      const hasExpress = args.includes(EXPRESS_FLAG);\n\n      // Already in the wanted state, so re-running - and a project generated\n      // after this change - is a no-op.\n      if (hasExpress === wantsExpress) {\n        continue;\n      }\n\n      // `--no-express` is a deliberate opt-out, so honour it rather than\n      // flipping the user back to express mode.\n      if (wantsExpress && args.includes(NO_EXPRESS_FLAG)) {\n        continue;\n      }\n\n      if (!isGeneratedDeployCommand(command)) {\n        nextSteps.push(divergedNextStep(name, targetName, wantsExpress));\n        continue;\n      }\n\n      // Appended last so it stays clear of the stage pattern, which the\n      // stage-config deploy script reads from the first positional argument.\n      target.options.command = wantsExpress\n        ? `${command} ${EXPRESS_FLAG}`\n        : withoutExpress(command);\n      projectChanged = true;\n    }\n\n    if (projectChanged) {\n      updateProjectConfiguration(tree, name, project);\n      migrated = true;\n    }\n  }\n\n  if (migrated) {\n    await formatFilesInSubtree(tree);\n  }\n\n  return { nextSteps };\n}\n"],"names":["getProjects","updateProjectConfiguration","INFRA_APP_GENERATOR_INFO","formatFilesInSubtree","EXPRESS_FLAG","NO_EXPRESS_FLAG","WANTS_EXPRESS","deploy","isGeneratedDeployCommand","command","test","includes","divergedNextStep","projectName","target","wantsExpress","withoutExpress","split","filter","arg","join","migration","tree","nextSteps","migrated","name","project","metadata","generator","id","projectChanged","targetName","Object","entries","targets","options","args","hasExpress","push"],"mappings":"AAAA;;;CAGC,GACD,SACEA,WAAW,EAIXC,0BAA0B,QACrB,aAAa;AACpB,SAASC,wBAAwB,QAAQ,kCAAkC;AAC3E,SAASC,oBAAoB,QAAQ,2BAA2B;AAEhE;;;;;;;;;;;;CAYC,GAED,MAAMC,eAAe;AACrB,MAAMC,kBAAkB;AAExB,6EAA6E,GAC7E,MAAMC,gBAAyC;IAC7C,kBAAkB;IAClBC,QAAQ;AACV;AAEA;;;;;CAKC,GACD,MAAMC,2BAA2B,CAACC,UAChC,2BAA2BC,IAAI,CAACD,YAChCA,QAAQE,QAAQ,CAAC;AAEnB,MAAMC,mBAAmB,CACvBC,aACAC,QACAC,eAEAA,eACI,GAAGF,YAAY,MAAM,EAAEC,OAAO,2DAA2D,EAAEV,aAAa,sEAAsE,CAAC,GAC/K,GAAGS,YAAY,MAAM,EAAEC,OAAO,8DAA8D,EAAEV,aAAa,+HAA+H,CAAC;AAEjP,gFAAgF,GAChF,MAAMY,iBAAiB,CAACP,UACtBA,QACGQ,KAAK,CAAC,OACNC,MAAM,CAAC,CAACC,MAAQA,QAAQf,cACxBgB,IAAI,CAAC;AAEV,eAAe,eAAeC,UAC5BC,IAAU;IAEV,MAAMC,YAAsB,EAAE;IAC9B,IAAIC,WAAW;IAEf,KAAK,MAAM,CAACC,MAAMC,QAAQ,IAAI1B,YAAYsB,MAAO;QAC/C,IACE,AAACI,QAAQC,QAAQ,EAAyCC,cAC1D1B,yBAAyB2B,EAAE,EAC3B;YACA;QACF;QAEA,IAAIC,iBAAiB;QAErB,KAAK,MAAM,CAACC,YAAYhB,aAAa,IAAIiB,OAAOC,OAAO,CAAC3B,eAAgB;YACtE,MAAMQ,SACJY,QAAQQ,OAAO,EAAE,CAACH,WAAW;YAC/B,MAAMtB,UAAUK,QAAQqB,SAAS1B;YACjC,IAAI,CAACK,UAAU,OAAOL,YAAY,UAAU;gBAC1C;YACF;YAEA,MAAM2B,OAAO3B,QAAQQ,KAAK,CAAC;YAC3B,MAAMoB,aAAaD,KAAKzB,QAAQ,CAACP;YAEjC,uEAAuE;YACvE,kCAAkC;YAClC,IAAIiC,eAAetB,cAAc;gBAC/B;YACF;YAEA,mEAAmE;YACnE,0CAA0C;YAC1C,IAAIA,gBAAgBqB,KAAKzB,QAAQ,CAACN,kBAAkB;gBAClD;YACF;YAEA,IAAI,CAACG,yBAAyBC,UAAU;gBACtCc,UAAUe,IAAI,CAAC1B,iBAAiBa,MAAMM,YAAYhB;gBAClD;YACF;YAEA,kEAAkE;YAClE,uEAAuE;YACvED,OAAOqB,OAAO,CAAC1B,OAAO,GAAGM,eACrB,GAAGN,QAAQ,CAAC,EAAEL,cAAc,GAC5BY,eAAeP;YACnBqB,iBAAiB;QACnB;QAEA,IAAIA,gBAAgB;YAClB7B,2BAA2BqB,MAAMG,MAAMC;YACvCF,WAAW;QACb;IACF;IAEA,IAAIA,UAAU;QACZ,MAAMrB,qBAAqBmB;IAC7B;IAEA,OAAO;QAAEC;IAAU;AACrB"}

package/src/migrations/latest/py-lambda-powertools-context/metadata.json

@@ -0,0 +1,3 @@
+{
+  "description": "Add powertools Lambda context injection and cold start metrics to Python Lambda handlers"
+}

package/src/migrations/latest/py-lambda-powertools-context/migration.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type MigrationReturnObject, type Tree } from '@nx/devkit';
+export default function migration(tree: Tree): Promise<MigrationReturnObject>;

package/src/migrations/latest/py-lambda-powertools-context/migration.js

@@ -0,0 +1,58 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { getProjects, joinPathFragments } from "@nx/devkit";
+import { LAMBDA_FUNCTION_GENERATOR_INFO } from "../../../py/lambda-function/generator.js";
+import { applyGritQL, matchGritQL } from "../../../utils/ast.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+/**
+ * Wire powertools Lambda context injection and the cold start metric into
+ * handlers generated by py#lambda-function.
+ *
+ * `@logger.inject_lambda_context` is what annotates each log record with the
+ * function name, request id, memory size and cold start flag, and
+ * `capture_cold_start_metric` is what emits the `ColdStart` metric.
+ *
+ * Both rewrites are scoped to the decorator list of the `lambda_handler`
+ * definition, so a `@metrics.log_metrics` decorating another function in the
+ * same module is left alone.
+ */ const INJECT_CONTEXT = '@logger.inject_lambda_context';
+const LOG_METRICS_OLD = '@metrics.log_metrics';
+const LOG_METRICS_NEW = '@metrics.log_metrics(capture_cold_start_metric=True)';
+const HANDLER_DECORATORS = (body)=>`language python
+decorated_definition($decorators, $definition) where {
+  $definition <: contains \`lambda_handler\`,
+  ${body}
+}`;
+/** The shape the generator produces: a bare `log_metrics` below the tracer. */ const GENERATED_SHAPE = HANDLER_DECORATORS(`$decorators <: contains \`@tracer.capture_lambda_handler\`,
+  $decorators <: contains \`${LOG_METRICS_OLD}\``);
+const ALREADY_MIGRATED = HANDLER_DECORATORS(`$decorators <: contains \`${INJECT_CONTEXT}\`,
+  $decorators <: contains \`${LOG_METRICS_NEW}\``);
+const REWRITE = HANDLER_DECORATORS(`$decorators <: contains \`@tracer.capture_lambda_handler\` => raw\`@tracer.capture_lambda_handler
+${INJECT_CONTEXT}\`,
+  $decorators <: contains \`${LOG_METRICS_OLD}\` => \`${LOG_METRICS_NEW}\``);
+const migrateHandler = async (tree, handlerPath, nextSteps)=>{
+    if (!tree.exists(handlerPath)) return;
+    if (await matchGritQL(tree, handlerPath, ALREADY_MIGRATED)) return;
+    if (!await matchGritQL(tree, handlerPath, GENERATED_SHAPE)) {
+        nextSteps.push(`${handlerPath}: diverged from the generated py#lambda-function shape - left untouched. To annotate logs with the Lambda context and emit a ColdStart metric, add \`${INJECT_CONTEXT}\` to the handler and change \`${LOG_METRICS_OLD}\` to \`${LOG_METRICS_NEW}\`.`);
+        return;
+    }
+    await applyGritQL(tree, handlerPath, REWRITE);
+};
+export default async function migration(tree) {
+    const nextSteps = [];
+    for (const project of getProjects(tree).values()){
+        const components = (project.metadata?.components ?? []).filter((component)=>component.generator === LAMBDA_FUNCTION_GENERATOR_INFO.id);
+        for (const component of components){
+            if (!component.path) continue;
+            await migrateHandler(tree, joinPathFragments(project.root, component.path), nextSteps);
+        }
+    }
+    await formatFilesInSubtree(tree);
+    return {
+        nextSteps
+    };
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/latest/py-lambda-powertools-context/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/py-lambda-powertools-context/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  getProjects,\n  joinPathFragments,\n  type MigrationReturnObject,\n  type Tree,\n} from '@nx/devkit';\nimport { LAMBDA_FUNCTION_GENERATOR_INFO } from '../../../py/lambda-function/generator.js';\nimport { applyGritQL, matchGritQL } from '../../../utils/ast.js';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\nimport type { ComponentMetadata } from '../../../utils/nx.js';\n\n/**\n * Wire powertools Lambda context injection and the cold start metric into\n * handlers generated by py#lambda-function.\n *\n * `@logger.inject_lambda_context` is what annotates each log record with the\n * function name, request id, memory size and cold start flag, and\n * `capture_cold_start_metric` is what emits the `ColdStart` metric.\n *\n * Both rewrites are scoped to the decorator list of the `lambda_handler`\n * definition, so a `@metrics.log_metrics` decorating another function in the\n * same module is left alone.\n */\nconst INJECT_CONTEXT = '@logger.inject_lambda_context';\nconst LOG_METRICS_OLD = '@metrics.log_metrics';\nconst LOG_METRICS_NEW = '@metrics.log_metrics(capture_cold_start_metric=True)';\n\nconst HANDLER_DECORATORS = (body: string) => `language python\ndecorated_definition($decorators, $definition) where {\n  $definition <: contains \\`lambda_handler\\`,\n  ${body}\n}`;\n\n/** The shape the generator produces: a bare `log_metrics` below the tracer. */\nconst GENERATED_SHAPE =\n  HANDLER_DECORATORS(`$decorators <: contains \\`@tracer.capture_lambda_handler\\`,\n  $decorators <: contains \\`${LOG_METRICS_OLD}\\``);\n\nconst ALREADY_MIGRATED =\n  HANDLER_DECORATORS(`$decorators <: contains \\`${INJECT_CONTEXT}\\`,\n  $decorators <: contains \\`${LOG_METRICS_NEW}\\``);\n\nconst REWRITE =\n  HANDLER_DECORATORS(`$decorators <: contains \\`@tracer.capture_lambda_handler\\` => raw\\`@tracer.capture_lambda_handler\n${INJECT_CONTEXT}\\`,\n  $decorators <: contains \\`${LOG_METRICS_OLD}\\` => \\`${LOG_METRICS_NEW}\\``);\n\nconst migrateHandler = async (\n  tree: Tree,\n  handlerPath: string,\n  nextSteps: string[],\n): Promise<void> => {\n  if (!tree.exists(handlerPath)) return;\n\n  if (await matchGritQL(tree, handlerPath, ALREADY_MIGRATED)) return;\n\n  if (!(await matchGritQL(tree, handlerPath, GENERATED_SHAPE))) {\n    nextSteps.push(\n      `${handlerPath}: diverged from the generated py#lambda-function shape - left untouched. To annotate logs with the Lambda context and emit a ColdStart metric, add \\`${INJECT_CONTEXT}\\` to the handler and change \\`${LOG_METRICS_OLD}\\` to \\`${LOG_METRICS_NEW}\\`.`,\n    );\n    return;\n  }\n\n  await applyGritQL(tree, handlerPath, REWRITE);\n};\n\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [];\n\n  for (const project of getProjects(tree).values()) {\n    const components = (\n      (project.metadata as { components?: ComponentMetadata[] })?.components ??\n      []\n    ).filter(\n      (component) => component.generator === LAMBDA_FUNCTION_GENERATOR_INFO.id,\n    );\n\n    for (const component of components) {\n      if (!component.path) continue;\n      await migrateHandler(\n        tree,\n        joinPathFragments(project.root, component.path),\n        nextSteps,\n      );\n    }\n  }\n\n  await formatFilesInSubtree(tree);\n\n  return { nextSteps };\n}\n"],"names":["getProjects","joinPathFragments","LAMBDA_FUNCTION_GENERATOR_INFO","applyGritQL","matchGritQL","formatFilesInSubtree","INJECT_CONTEXT","LOG_METRICS_OLD","LOG_METRICS_NEW","HANDLER_DECORATORS","body","GENERATED_SHAPE","ALREADY_MIGRATED","REWRITE","migrateHandler","tree","handlerPath","nextSteps","exists","push","migration","project","values","components","metadata","filter","component","generator","id","path","root"],"mappings":"AAAA;;;CAGC,GACD,SACEA,WAAW,EACXC,iBAAiB,QAGZ,aAAa;AACpB,SAASC,8BAA8B,QAAQ,2CAA2C;AAC1F,SAASC,WAAW,EAAEC,WAAW,QAAQ,wBAAwB;AACjE,SAASC,oBAAoB,QAAQ,2BAA2B;AAGhE;;;;;;;;;;;CAWC,GACD,MAAMC,iBAAiB;AACvB,MAAMC,kBAAkB;AACxB,MAAMC,kBAAkB;AAExB,MAAMC,qBAAqB,CAACC,OAAiB,CAAC;;;EAG5C,EAAEA,KAAK;CACR,CAAC;AAEF,6EAA6E,GAC7E,MAAMC,kBACJF,mBAAmB,CAAC;4BACM,EAAEF,gBAAgB,EAAE,CAAC;AAEjD,MAAMK,mBACJH,mBAAmB,CAAC,0BAA0B,EAAEH,eAAe;4BACrC,EAAEE,gBAAgB,EAAE,CAAC;AAEjD,MAAMK,UACJJ,mBAAmB,CAAC;AACtB,EAAEH,eAAe;4BACW,EAAEC,gBAAgB,QAAQ,EAAEC,gBAAgB,EAAE,CAAC;AAE3E,MAAMM,iBAAiB,OACrBC,MACAC,aACAC;IAEA,IAAI,CAACF,KAAKG,MAAM,CAACF,cAAc;IAE/B,IAAI,MAAMZ,YAAYW,MAAMC,aAAaJ,mBAAmB;IAE5D,IAAI,CAAE,MAAMR,YAAYW,MAAMC,aAAaL,kBAAmB;QAC5DM,UAAUE,IAAI,CACZ,GAAGH,YAAY,qJAAqJ,EAAEV,eAAe,+BAA+B,EAAEC,gBAAgB,QAAQ,EAAEC,gBAAgB,GAAG,CAAC;QAEtQ;IACF;IAEA,MAAML,YAAYY,MAAMC,aAAaH;AACvC;AAEA,eAAe,eAAeO,UAC5BL,IAAU;IAEV,MAAME,YAAsB,EAAE;IAE9B,KAAK,MAAMI,WAAWrB,YAAYe,MAAMO,MAAM,GAAI;QAChD,MAAMC,aAAa,AACjB,CAAA,AAACF,QAAQG,QAAQ,EAA2CD,cAC5D,EAAE,AAAD,EACDE,MAAM,CACN,CAACC,YAAcA,UAAUC,SAAS,KAAKzB,+BAA+B0B,EAAE;QAG1E,KAAK,MAAMF,aAAaH,WAAY;YAClC,IAAI,CAACG,UAAUG,IAAI,EAAE;YACrB,MAAMf,eACJC,MACAd,kBAAkBoB,QAAQS,IAAI,EAAEJ,UAAUG,IAAI,GAC9CZ;QAEJ;IACF;IAEA,MAAMZ,qBAAqBU;IAE3B,OAAO;QAAEE;IAAU;AACrB"}

package/src/migrations/latest/script-project-quality-gates/metadata.json

@@ -0,0 +1,3 @@
+{
+  "description": "Add build, lint, format and typecheck targets plus a tsconfig.json to AgentCore Gateway and Harness projects"
+}

package/src/migrations/latest/script-project-quality-gates/migration.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type MigrationReturnObject, type Tree } from '@nx/devkit';
+export default function migration(tree: Tree): Promise<MigrationReturnObject>;

package/src/migrations/latest/script-project-quality-gates/migration.js

@@ -0,0 +1,53 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { getProjects, joinPathFragments, updateProjectConfiguration } from "@nx/devkit";
+import { AGENTCORE_GATEWAY_GENERATOR_INFO } from "../../../agentcore-gateway/generator.js";
+import { AGENTCORE_HARNESS_GENERATOR_INFO } from "../../../agentcore-harness/generator.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { addScriptProjectTargets } from "../../../utils/script-project-targets.js";
+/**
+ * AgentCore Gateway and Harness projects host TypeScript that runs through
+ * `tsx` — a Gateway's `local-dev.ts` (which the connection generators edit) and
+ * a Harness's `scripts/chat.ts`. Neither project had a `tsconfig.json` or a
+ * `build`, `lint`, `format` or `typecheck` target, so that code was invisible to
+ * `nx run-many --target build --all` and a type error in it only surfaced at
+ * runtime.
+ *
+ * How to write a migration:
+ * - https://nx.dev/docs/kb/migration-generators
+ * - What `nextSteps` means: https://nx.dev/docs/reference/devkit/MigrationReturnObject
+ */ /** The generators whose projects gain the gates. */ const SCRIPT_PROJECT_GENERATORS = [
+    AGENTCORE_GATEWAY_GENERATOR_INFO.id,
+    AGENTCORE_HARNESS_GENERATOR_INFO.id
+];
+export default async function migration(tree) {
+    const nextSteps = [];
+    for (const [, project] of getProjects(tree)){
+        const generator = project.metadata?.generator;
+        if (!generator || !SCRIPT_PROJECT_GENERATORS.includes(generator)) {
+            continue;
+        }
+        // Already migrated (or the user added their own gates).
+        if (project.targets?.typecheck) {
+            continue;
+        }
+        // A project that has been reworked into a compiled `ts#project` owns its own
+        // tsconfig graph, so leave it alone rather than layering a `noEmit` config on
+        // top of one that emits.
+        if (tree.exists(joinPathFragments(project.root, 'tsconfig.lib.json'))) {
+            nextSteps.push(`Project '${project.name}' has a tsconfig.lib.json, so its quality gates were left as they are. Confirm its build covers the TypeScript at ${project.root}.`);
+            continue;
+        }
+        addScriptProjectTargets(tree, {
+            project
+        });
+        updateProjectConfiguration(tree, project.name, project);
+    }
+    await formatFilesInSubtree(tree);
+    return {
+        nextSteps
+    };
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/latest/script-project-quality-gates/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/script-project-quality-gates/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  getProjects,\n  joinPathFragments,\n  type MigrationReturnObject,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { AGENTCORE_GATEWAY_GENERATOR_INFO } from '../../../agentcore-gateway/generator.js';\nimport { AGENTCORE_HARNESS_GENERATOR_INFO } from '../../../agentcore-harness/generator.js';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\nimport { addScriptProjectTargets } from '../../../utils/script-project-targets.js';\n\n/**\n * AgentCore Gateway and Harness projects host TypeScript that runs through\n * `tsx` — a Gateway's `local-dev.ts` (which the connection generators edit) and\n * a Harness's `scripts/chat.ts`. Neither project had a `tsconfig.json` or a\n * `build`, `lint`, `format` or `typecheck` target, so that code was invisible to\n * `nx run-many --target build --all` and a type error in it only surfaced at\n * runtime.\n *\n * How to write a migration:\n * - https://nx.dev/docs/kb/migration-generators\n * - What `nextSteps` means: https://nx.dev/docs/reference/devkit/MigrationReturnObject\n */\n\n/** The generators whose projects gain the gates. */\nconst SCRIPT_PROJECT_GENERATORS = [\n  AGENTCORE_GATEWAY_GENERATOR_INFO.id,\n  AGENTCORE_HARNESS_GENERATOR_INFO.id,\n];\n\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [];\n\n  for (const [, project] of getProjects(tree)) {\n    const generator = (project.metadata as { generator?: string } | undefined)\n      ?.generator;\n    if (!generator || !SCRIPT_PROJECT_GENERATORS.includes(generator)) {\n      continue;\n    }\n    // Already migrated (or the user added their own gates).\n    if (project.targets?.typecheck) {\n      continue;\n    }\n    // A project that has been reworked into a compiled `ts#project` owns its own\n    // tsconfig graph, so leave it alone rather than layering a `noEmit` config on\n    // top of one that emits.\n    if (tree.exists(joinPathFragments(project.root, 'tsconfig.lib.json'))) {\n      nextSteps.push(\n        `Project '${project.name}' has a tsconfig.lib.json, so its quality gates were left as they are. Confirm its build covers the TypeScript at ${project.root}.`,\n      );\n      continue;\n    }\n\n    addScriptProjectTargets(tree, { project });\n    updateProjectConfiguration(tree, project.name, project);\n  }\n\n  await formatFilesInSubtree(tree);\n\n  return { nextSteps };\n}\n"],"names":["getProjects","joinPathFragments","updateProjectConfiguration","AGENTCORE_GATEWAY_GENERATOR_INFO","AGENTCORE_HARNESS_GENERATOR_INFO","formatFilesInSubtree","addScriptProjectTargets","SCRIPT_PROJECT_GENERATORS","id","migration","tree","nextSteps","project","generator","metadata","includes","targets","typecheck","exists","root","push","name"],"mappings":"AAAA;;;CAGC,GACD,SACEA,WAAW,EACXC,iBAAiB,EAGjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,gCAAgC,QAAQ,0CAA0C;AAC3F,SAASC,gCAAgC,QAAQ,0CAA0C;AAC3F,SAASC,oBAAoB,QAAQ,2BAA2B;AAChE,SAASC,uBAAuB,QAAQ,2CAA2C;AAEnF;;;;;;;;;;;CAWC,GAED,kDAAkD,GAClD,MAAMC,4BAA4B;IAChCJ,iCAAiCK,EAAE;IACnCJ,iCAAiCI,EAAE;CACpC;AAED,eAAe,eAAeC,UAC5BC,IAAU;IAEV,MAAMC,YAAsB,EAAE;IAE9B,KAAK,MAAM,GAAGC,QAAQ,IAAIZ,YAAYU,MAAO;QAC3C,MAAMG,YAAaD,QAAQE,QAAQ,EAC/BD;QACJ,IAAI,CAACA,aAAa,CAACN,0BAA0BQ,QAAQ,CAACF,YAAY;YAChE;QACF;QACA,wDAAwD;QACxD,IAAID,QAAQI,OAAO,EAAEC,WAAW;YAC9B;QACF;QACA,6EAA6E;QAC7E,8EAA8E;QAC9E,yBAAyB;QACzB,IAAIP,KAAKQ,MAAM,CAACjB,kBAAkBW,QAAQO,IAAI,EAAE,uBAAuB;YACrER,UAAUS,IAAI,CACZ,CAAC,SAAS,EAAER,QAAQS,IAAI,CAAC,kHAAkH,EAAET,QAAQO,IAAI,CAAC,CAAC,CAAC;YAE9J;QACF;QAEAb,wBAAwBI,MAAM;YAAEE;QAAQ;QACxCV,2BAA2BQ,MAAME,QAAQS,IAAI,EAAET;IACjD;IAEA,MAAMP,qBAAqBK;IAE3B,OAAO;QAAEC;IAAU;AACrB"}

package/src/migrations/latest/smithy-extension-trait-aliases/__snapshots__/migration.spec.ts.snap

@@ -0,0 +1,25 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`smithy-extension-trait-aliases migration > should alias every vended trait 1`] = `
+"$version: "2.0"
+
+namespace com.example
+
+use smithy.openapi#specificationExtension
+
+@trait
+@specificationExtension(as: "x-query")
+structure query {}
+
+@trait
+@specificationExtension(as: "x-mutation")
+structure mutation {}
+
+@trait
+@specificationExtension(as: "x-cursor")
+structure cursor {
+  inputToken: String
+  enabled: Boolean
+}
+"
+`;

package/src/migrations/latest/smithy-extension-trait-aliases/metadata.json

@@ -0,0 +1,3 @@
+{
+  "description": "Alias the extensions.smithy vendor-extension traits so Smithy emits x-query / x-mutation / x-cursor"
+}

package/src/migrations/latest/smithy-extension-trait-aliases/migration.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type MigrationReturnObject, type Tree } from '@nx/devkit';
+/**
+ * Give each trait in a Smithy model's `extensions.smithy` an explicit
+ * `@specificationExtension(as: "...")` alias.
+ *
+ * Without the alias Smithy derives the OpenAPI key from the trait's shape id and
+ * emits a namespace-prefixed key (`x-<namespace>-query`), which the client code
+ * generator does not read — so the `@query`, `@mutation` and `@cursor` traits
+ * have no effect on the generated client. The alias pins each key to the
+ * unprefixed name the generator recognises.
+ *
+ * How to write a migration:
+ * - https://nx.dev/docs/kb/migration-generators
+ * - What `nextSteps` means: https://nx.dev/docs/reference/devkit/MigrationReturnObject
+ *
+ * Guardrails:
+ * - Smithy IDL is not a language GritQL parses, so each edit is anchored to the
+ *   exact `@trait` + `@specificationExtension` + `structure <name>` triple the
+ *   generator vends.
+ * - A declaration that already carries an `as:` argument, or that has diverged
+ *   from the vended shape, is left alone and reported via `nextSteps`.
+ * - Idempotent: an aliased declaration no longer matches the bare pattern.
+ */
+export default function migration(tree: Tree): Promise<MigrationReturnObject>;

package/src/migrations/latest/smithy-extension-trait-aliases/migration.js

@@ -0,0 +1,75 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { getProjects, joinPathFragments } from "@nx/devkit";
+import { SMITHY_PROJECT_GENERATOR_INFO } from "../../../smithy/project/generator.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+/** The traits the connection generator vends, each named after its OpenAPI key. */ const TRAITS = [
+    'query',
+    'mutation',
+    'cursor'
+];
+/**
+ * Matches a bare `@specificationExtension` applied to the named structure, with
+ * the `@trait` and `@specificationExtension` traits adjacent to the `structure`
+ * they annotate. A declaration that already carries an argument does not match.
+ */ const bareDeclaration = (trait)=>new RegExp(`(@trait\\s*\\n\\s*@specificationExtension)(\\s*\\n\\s*structure\\s+${trait}\\s*\\{)`);
+/**
+ * Give each trait in a Smithy model's `extensions.smithy` an explicit
+ * `@specificationExtension(as: "...")` alias.
+ *
+ * Without the alias Smithy derives the OpenAPI key from the trait's shape id and
+ * emits a namespace-prefixed key (`x-<namespace>-query`), which the client code
+ * generator does not read — so the `@query`, `@mutation` and `@cursor` traits
+ * have no effect on the generated client. The alias pins each key to the
+ * unprefixed name the generator recognises.
+ *
+ * How to write a migration:
+ * - https://nx.dev/docs/kb/migration-generators
+ * - What `nextSteps` means: https://nx.dev/docs/reference/devkit/MigrationReturnObject
+ *
+ * Guardrails:
+ * - Smithy IDL is not a language GritQL parses, so each edit is anchored to the
+ *   exact `@trait` + `@specificationExtension` + `structure <name>` triple the
+ *   generator vends.
+ * - A declaration that already carries an `as:` argument, or that has diverged
+ *   from the vended shape, is left alone and reported via `nextSteps`.
+ * - Idempotent: an aliased declaration no longer matches the bare pattern.
+ */ export default async function migration(tree) {
+    const nextSteps = [];
+    for (const [, project] of getProjects(tree)){
+        if ((project.metadata ?? {}).generator !== SMITHY_PROJECT_GENERATOR_INFO.id) {
+            continue;
+        }
+        const extensionsPath = joinPathFragments(project.sourceRoot ?? joinPathFragments(project.root, 'src'), 'extensions.smithy');
+        if (!tree.exists(extensionsPath)) {
+            continue;
+        }
+        const before = tree.read(extensionsPath, 'utf-8') ?? '';
+        let after = before;
+        const skipped = [];
+        for (const trait of TRAITS){
+            if (after.includes(`@specificationExtension(as: "x-${trait}")`)) {
+                continue;
+            }
+            const bare = bareDeclaration(trait);
+            if (!bare.test(after)) {
+                skipped.push(trait);
+                continue;
+            }
+            after = after.replace(bare, `$1(as: "x-${trait}")$2`);
+        }
+        if (after !== before) {
+            tree.write(extensionsPath, after);
+        }
+        if (skipped.length > 0) {
+            nextSteps.push(`${extensionsPath}: add ${skipped.map((trait)=>`\`(as: "x-${trait}")\``).join(', ')} to the \`@specificationExtension\` trait on ${skipped.map((trait)=>`\`${trait}\``).join(', ')}, so Smithy emits the ${skipped.map((trait)=>`\`x-${trait}\``).join(', ')} OpenAPI ${skipped.length === 1 ? 'key' : 'keys'} the client generator reads.`);
+        }
+    }
+    await formatFilesInSubtree(tree);
+    return {
+        nextSteps
+    };
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/latest/smithy-extension-trait-aliases/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/smithy-extension-trait-aliases/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  getProjects,\n  joinPathFragments,\n  type MigrationReturnObject,\n  type Tree,\n} from '@nx/devkit';\nimport { SMITHY_PROJECT_GENERATOR_INFO } from '../../../smithy/project/generator.js';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\n\n/** The traits the connection generator vends, each named after its OpenAPI key. */\nconst TRAITS = ['query', 'mutation', 'cursor'] as const;\n\n/**\n * Matches a bare `@specificationExtension` applied to the named structure, with\n * the `@trait` and `@specificationExtension` traits adjacent to the `structure`\n * they annotate. A declaration that already carries an argument does not match.\n */\nconst bareDeclaration = (trait: string) =>\n  new RegExp(\n    `(@trait\\\\s*\\\\n\\\\s*@specificationExtension)(\\\\s*\\\\n\\\\s*structure\\\\s+${trait}\\\\s*\\\\{)`,\n  );\n\n/**\n * Give each trait in a Smithy model's `extensions.smithy` an explicit\n * `@specificationExtension(as: \"...\")` alias.\n *\n * Without the alias Smithy derives the OpenAPI key from the trait's shape id and\n * emits a namespace-prefixed key (`x-<namespace>-query`), which the client code\n * generator does not read — so the `@query`, `@mutation` and `@cursor` traits\n * have no effect on the generated client. The alias pins each key to the\n * unprefixed name the generator recognises.\n *\n * How to write a migration:\n * - https://nx.dev/docs/kb/migration-generators\n * - What `nextSteps` means: https://nx.dev/docs/reference/devkit/MigrationReturnObject\n *\n * Guardrails:\n * - Smithy IDL is not a language GritQL parses, so each edit is anchored to the\n *   exact `@trait` + `@specificationExtension` + `structure <name>` triple the\n *   generator vends.\n * - A declaration that already carries an `as:` argument, or that has diverged\n *   from the vended shape, is left alone and reported via `nextSteps`.\n * - Idempotent: an aliased declaration no longer matches the bare pattern.\n */\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [];\n\n  for (const [, project] of getProjects(tree)) {\n    if (\n      ((project.metadata as any) ?? {}).generator !==\n      SMITHY_PROJECT_GENERATOR_INFO.id\n    ) {\n      continue;\n    }\n\n    const extensionsPath = joinPathFragments(\n      project.sourceRoot ?? joinPathFragments(project.root, 'src'),\n      'extensions.smithy',\n    );\n    if (!tree.exists(extensionsPath)) {\n      continue;\n    }\n\n    const before = tree.read(extensionsPath, 'utf-8') ?? '';\n    let after = before;\n    const skipped: string[] = [];\n\n    for (const trait of TRAITS) {\n      if (after.includes(`@specificationExtension(as: \"x-${trait}\")`)) {\n        // Already aliased.\n        continue;\n      }\n      const bare = bareDeclaration(trait);\n      if (!bare.test(after)) {\n        skipped.push(trait);\n        continue;\n      }\n      after = after.replace(bare, `$1(as: \"x-${trait}\")$2`);\n    }\n\n    if (after !== before) {\n      tree.write(extensionsPath, after);\n    }\n\n    if (skipped.length > 0) {\n      nextSteps.push(\n        `${extensionsPath}: add ${skipped\n          .map((trait) => `\\`(as: \"x-${trait}\")\\``)\n          .join(\n            ', ',\n          )} to the \\`@specificationExtension\\` trait on ${skipped.map((trait) => `\\`${trait}\\``).join(', ')}, so Smithy emits the ${skipped.map((trait) => `\\`x-${trait}\\``).join(', ')} OpenAPI ${skipped.length === 1 ? 'key' : 'keys'} the client generator reads.`,\n      );\n    }\n  }\n\n  await formatFilesInSubtree(tree);\n\n  return { nextSteps };\n}\n"],"names":["getProjects","joinPathFragments","SMITHY_PROJECT_GENERATOR_INFO","formatFilesInSubtree","TRAITS","bareDeclaration","trait","RegExp","migration","tree","nextSteps","project","metadata","generator","id","extensionsPath","sourceRoot","root","exists","before","read","after","skipped","includes","bare","test","push","replace","write","length","map","join"],"mappings":"AAAA;;;CAGC,GACD,SACEA,WAAW,EACXC,iBAAiB,QAGZ,aAAa;AACpB,SAASC,6BAA6B,QAAQ,uCAAuC;AACrF,SAASC,oBAAoB,QAAQ,2BAA2B;AAEhE,iFAAiF,GACjF,MAAMC,SAAS;IAAC;IAAS;IAAY;CAAS;AAE9C;;;;CAIC,GACD,MAAMC,kBAAkB,CAACC,QACvB,IAAIC,OACF,CAAC,mEAAmE,EAAED,MAAM,QAAQ,CAAC;AAGzF;;;;;;;;;;;;;;;;;;;;;CAqBC,GACD,eAAe,eAAeE,UAC5BC,IAAU;IAEV,MAAMC,YAAsB,EAAE;IAE9B,KAAK,MAAM,GAAGC,QAAQ,IAAIX,YAAYS,MAAO;QAC3C,IACE,AAAC,CAAA,AAACE,QAAQC,QAAQ,IAAY,CAAC,CAAA,EAAGC,SAAS,KAC3CX,8BAA8BY,EAAE,EAChC;YACA;QACF;QAEA,MAAMC,iBAAiBd,kBACrBU,QAAQK,UAAU,IAAIf,kBAAkBU,QAAQM,IAAI,EAAE,QACtD;QAEF,IAAI,CAACR,KAAKS,MAAM,CAACH,iBAAiB;YAChC;QACF;QAEA,MAAMI,SAASV,KAAKW,IAAI,CAACL,gBAAgB,YAAY;QACrD,IAAIM,QAAQF;QACZ,MAAMG,UAAoB,EAAE;QAE5B,KAAK,MAAMhB,SAASF,OAAQ;YAC1B,IAAIiB,MAAME,QAAQ,CAAC,CAAC,+BAA+B,EAAEjB,MAAM,EAAE,CAAC,GAAG;gBAE/D;YACF;YACA,MAAMkB,OAAOnB,gBAAgBC;YAC7B,IAAI,CAACkB,KAAKC,IAAI,CAACJ,QAAQ;gBACrBC,QAAQI,IAAI,CAACpB;gBACb;YACF;YACAe,QAAQA,MAAMM,OAAO,CAACH,MAAM,CAAC,UAAU,EAAElB,MAAM,IAAI,CAAC;QACtD;QAEA,IAAIe,UAAUF,QAAQ;YACpBV,KAAKmB,KAAK,CAACb,gBAAgBM;QAC7B;QAEA,IAAIC,QAAQO,MAAM,GAAG,GAAG;YACtBnB,UAAUgB,IAAI,CACZ,GAAGX,eAAe,MAAM,EAAEO,QACvBQ,GAAG,CAAC,CAACxB,QAAU,CAAC,UAAU,EAAEA,MAAM,IAAI,CAAC,EACvCyB,IAAI,CACH,MACA,6CAA6C,EAAET,QAAQQ,GAAG,CAAC,CAACxB,QAAU,CAAC,EAAE,EAAEA,MAAM,EAAE,CAAC,EAAEyB,IAAI,CAAC,MAAM,sBAAsB,EAAET,QAAQQ,GAAG,CAAC,CAACxB,QAAU,CAAC,IAAI,EAAEA,MAAM,EAAE,CAAC,EAAEyB,IAAI,CAAC,MAAM,SAAS,EAAET,QAAQO,MAAM,KAAK,IAAI,QAAQ,OAAO,4BAA4B,CAAC;QAEnQ;IACF;IAEA,MAAM1B,qBAAqBM;IAE3B,OAAO;QAAEC;IAAU;AACrB"}

package/src/migrations/latest/terraform-validate-without-backend/metadata.json

@@ -0,0 +1,3 @@
+{
+  "description": "Run the Terraform validate target with -backend=false so it works before bootstrap"
+}

package/src/migrations/latest/terraform-validate-without-backend/migration.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type MigrationReturnObject, type Tree } from '@nx/devkit';
+export default function migration(tree: Tree): Promise<MigrationReturnObject>;