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

package/src/migrations/v1.0.0-rc.97/0003-terraform-validate-without-backend/migration.js

@@ -0,0 +1,84 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { getProjects, joinPathFragments, updateProjectConfiguration } from "@nx/devkit";
+import { relative } from "path";
+import { TERRAFORM_PROJECT_GENERATOR_INFO } from "../../../terraform/project/generator.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+/**
+ * Run `validate` against a backendless `terraform init` of its own, so it works
+ * on a fresh workspace.
+ *
+ * It previously depended on the `init` target. On an application project that
+ * runs the vended `scripts/init.ts`, which configures the S3 backend and fails
+ * with a raw `NoSuchBucket` trace until `bootstrap` has created the state
+ * bucket — so the first target the guide invites the reader to try was
+ * unrunnable, while `lint`, `test` and `checkov` all worked.
+ *
+ * `-backend=false` installs the modules and providers validation needs without
+ * configuring the backend, exactly as `test` already does, so no credentials are
+ * involved. `TF_DATA_DIR` keeps that `.terraform` out of `src` so it never races
+ * the backend-configured targets over the shared one, and the shared plugin
+ * cache means the providers are linked rather than re-downloaded.
+ */ const VALIDATE_TARGET = 'validate';
+/** The command the pre-fix target ran, on its own. */ const VENDED_COMMAND = 'terraform validate';
+const divergedMessage = (projectName)=>`${projectName}:${VALIDATE_TARGET}: has diverged from the generated shape - left untouched. To run it before \`bootstrap\`, have it run \`terraform init -backend=false\` ahead of \`terraform validate\` rather than depending on the \`init\` target, which configures the S3 backend.`;
+/** Path from a target running in `{projectRoot}/src` to the workspace root. */ const rootRelativePathFrom = (projectRoot)=>(relative(joinPathFragments(projectRoot, 'src'), '.') || '.').replace(/\\/g, '/');
+/** Whether the target is the exact shape the pre-fix generator produced. */ const hasVendedShape = (target)=>target.executor === 'nx:run-commands' && target.options?.command === VENDED_COMMAND && !target.options?.commands && target.options?.cwd === '{projectRoot}/src' && target.dependsOn?.length === 1 && target.dependsOn[0] === 'init';
+export default async function migration(tree) {
+    const nextSteps = [];
+    for (const [projectName, project] of getProjects(tree)){
+        const generator = project.metadata?.generator;
+        if (generator !== TERRAFORM_PROJECT_GENERATOR_INFO.id) continue;
+        const target = project.targets?.[VALIDATE_TARGET];
+        if (!target) continue;
+        // A target already running its own init needs nothing, which also makes a
+        // re-run — and a project generated after the fix — a no-op.
+        if (target.options?.env?.TF_DATA_DIR) continue;
+        if (!hasVendedShape(target)) {
+            nextSteps.push(divergedMessage(projectName));
+            continue;
+        }
+        const rootRelativePath = rootRelativePathFrom(project.root);
+        const pluginCacheDir = joinPathFragments(rootRelativePath, '.terraform', 'plugin-cache', '{projectRoot}').replace(/\\/g, '/');
+        const validateDataDir = joinPathFragments(rootRelativePath, 'dist', '{projectRoot}', 'terraform-validate').replace(/\\/g, '/');
+        const { command: _command, ...options } = target.options;
+        const { dependsOn: _dependsOn, ...rest } = target;
+        project.targets[VALIDATE_TARGET] = {
+            ...rest,
+            // `^production` mirrors `test`: validation resolves the relative modules a
+            // project consumes, so a change in one must invalidate it.
+            inputs: [
+                'default',
+                '^production'
+            ],
+            // `TF_DATA_DIR` is terraform's working directory, not an artifact — its
+            // provider entries are symlinks into the shared plugin cache.
+            outputs: [],
+            options: {
+                ...options,
+                commands: [
+                    {
+                        command: `shx mkdir -p ${pluginCacheDir}`,
+                        forwardAllArgs: false
+                    },
+                    'terraform init -backend=false',
+                    VENDED_COMMAND
+                ],
+                parallel: false,
+                env: {
+                    ...options.env,
+                    TF_DATA_DIR: validateDataDir,
+                    TF_PLUGIN_CACHE_DIR: pluginCacheDir
+                }
+            }
+        };
+        updateProjectConfiguration(tree, projectName, project);
+    }
+    await formatFilesInSubtree(tree);
+    return {
+        nextSteps
+    };
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/v1.0.0-rc.97/0003-terraform-validate-without-backend/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/v1.0.0-rc.97/0003-terraform-validate-without-backend/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 ProjectConfiguration,\n  type TargetConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { relative } from 'path';\nimport { TERRAFORM_PROJECT_GENERATOR_INFO } from '../../../terraform/project/generator.js';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\n\n/**\n * Run `validate` against a backendless `terraform init` of its own, so it works\n * on a fresh workspace.\n *\n * It previously depended on the `init` target. On an application project that\n * runs the vended `scripts/init.ts`, which configures the S3 backend and fails\n * with a raw `NoSuchBucket` trace until `bootstrap` has created the state\n * bucket — so the first target the guide invites the reader to try was\n * unrunnable, while `lint`, `test` and `checkov` all worked.\n *\n * `-backend=false` installs the modules and providers validation needs without\n * configuring the backend, exactly as `test` already does, so no credentials are\n * involved. `TF_DATA_DIR` keeps that `.terraform` out of `src` so it never races\n * the backend-configured targets over the shared one, and the shared plugin\n * cache means the providers are linked rather than re-downloaded.\n */\n\nconst VALIDATE_TARGET = 'validate';\n\n/** The command the pre-fix target ran, on its own. */\nconst VENDED_COMMAND = 'terraform validate';\n\nconst divergedMessage = (projectName: string) =>\n  `${projectName}:${VALIDATE_TARGET}: has diverged from the generated shape - left untouched. To run it before \\`bootstrap\\`, have it run \\`terraform init -backend=false\\` ahead of \\`terraform validate\\` rather than depending on the \\`init\\` target, which configures the S3 backend.`;\n\n/** Path from a target running in `{projectRoot}/src` to the workspace root. */\nconst rootRelativePathFrom = (projectRoot: string) =>\n  (relative(joinPathFragments(projectRoot, 'src'), '.') || '.').replace(\n    /\\\\/g,\n    '/',\n  );\n\n/** Whether the target is the exact shape the pre-fix generator produced. */\nconst hasVendedShape = (target: TargetConfiguration): boolean =>\n  target.executor === 'nx:run-commands' &&\n  target.options?.command === VENDED_COMMAND &&\n  !target.options?.commands &&\n  target.options?.cwd === '{projectRoot}/src' &&\n  target.dependsOn?.length === 1 &&\n  target.dependsOn[0] === 'init';\n\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [];\n\n  for (const [projectName, project] of getProjects(tree)) {\n    const generator = (project.metadata as { generator?: string } | undefined)\n      ?.generator;\n    if (generator !== TERRAFORM_PROJECT_GENERATOR_INFO.id) continue;\n\n    const target = project.targets?.[VALIDATE_TARGET];\n    if (!target) continue;\n\n    // A target already running its own init needs nothing, which also makes a\n    // re-run — and a project generated after the fix — a no-op.\n    if (target.options?.env?.TF_DATA_DIR) continue;\n\n    if (!hasVendedShape(target)) {\n      nextSteps.push(divergedMessage(projectName));\n      continue;\n    }\n\n    const rootRelativePath = rootRelativePathFrom(project.root);\n    const pluginCacheDir = joinPathFragments(\n      rootRelativePath,\n      '.terraform',\n      'plugin-cache',\n      '{projectRoot}',\n    ).replace(/\\\\/g, '/');\n    const validateDataDir = joinPathFragments(\n      rootRelativePath,\n      'dist',\n      '{projectRoot}',\n      'terraform-validate',\n    ).replace(/\\\\/g, '/');\n\n    const { command: _command, ...options } = target.options;\n    const { dependsOn: _dependsOn, ...rest } = target;\n\n    project.targets[VALIDATE_TARGET] = {\n      ...rest,\n      // `^production` mirrors `test`: validation resolves the relative modules a\n      // project consumes, so a change in one must invalidate it.\n      inputs: ['default', '^production'],\n      // `TF_DATA_DIR` is terraform's working directory, not an artifact — its\n      // provider entries are symlinks into the shared plugin cache.\n      outputs: [],\n      options: {\n        ...options,\n        commands: [\n          { command: `shx mkdir -p ${pluginCacheDir}`, forwardAllArgs: false },\n          'terraform init -backend=false',\n          VENDED_COMMAND,\n        ],\n        parallel: false,\n        env: {\n          ...options.env,\n          TF_DATA_DIR: validateDataDir,\n          TF_PLUGIN_CACHE_DIR: pluginCacheDir,\n        },\n      },\n    };\n\n    updateProjectConfiguration(\n      tree,\n      projectName,\n      project as ProjectConfiguration,\n    );\n  }\n\n  await formatFilesInSubtree(tree);\n\n  return { nextSteps };\n}\n"],"names":["getProjects","joinPathFragments","updateProjectConfiguration","relative","TERRAFORM_PROJECT_GENERATOR_INFO","formatFilesInSubtree","VALIDATE_TARGET","VENDED_COMMAND","divergedMessage","projectName","rootRelativePathFrom","projectRoot","replace","hasVendedShape","target","executor","options","command","commands","cwd","dependsOn","length","migration","tree","nextSteps","project","generator","metadata","id","targets","env","TF_DATA_DIR","push","rootRelativePath","root","pluginCacheDir","validateDataDir","_command","_dependsOn","rest","inputs","outputs","forwardAllArgs","parallel","TF_PLUGIN_CACHE_DIR"],"mappings":"AAAA;;;CAGC,GACD,SACEA,WAAW,EACXC,iBAAiB,EAKjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,QAAQ,QAAQ,OAAO;AAChC,SAASC,gCAAgC,QAAQ,0CAA0C;AAC3F,SAASC,oBAAoB,QAAQ,2BAA2B;AAEhE;;;;;;;;;;;;;;;CAeC,GAED,MAAMC,kBAAkB;AAExB,oDAAoD,GACpD,MAAMC,iBAAiB;AAEvB,MAAMC,kBAAkB,CAACC,cACvB,GAAGA,YAAY,CAAC,EAAEH,gBAAgB,sPAAsP,CAAC;AAE3R,6EAA6E,GAC7E,MAAMI,uBAAuB,CAACC,cAC5B,AAACR,CAAAA,SAASF,kBAAkBU,aAAa,QAAQ,QAAQ,GAAE,EAAGC,OAAO,CACnE,OACA;AAGJ,0EAA0E,GAC1E,MAAMC,iBAAiB,CAACC,SACtBA,OAAOC,QAAQ,KAAK,qBACpBD,OAAOE,OAAO,EAAEC,YAAYV,kBAC5B,CAACO,OAAOE,OAAO,EAAEE,YACjBJ,OAAOE,OAAO,EAAEG,QAAQ,uBACxBL,OAAOM,SAAS,EAAEC,WAAW,KAC7BP,OAAOM,SAAS,CAAC,EAAE,KAAK;AAE1B,eAAe,eAAeE,UAC5BC,IAAU;IAEV,MAAMC,YAAsB,EAAE;IAE9B,KAAK,MAAM,CAACf,aAAagB,QAAQ,IAAIzB,YAAYuB,MAAO;QACtD,MAAMG,YAAaD,QAAQE,QAAQ,EAC/BD;QACJ,IAAIA,cAActB,iCAAiCwB,EAAE,EAAE;QAEvD,MAAMd,SAASW,QAAQI,OAAO,EAAE,CAACvB,gBAAgB;QACjD,IAAI,CAACQ,QAAQ;QAEb,0EAA0E;QAC1E,4DAA4D;QAC5D,IAAIA,OAAOE,OAAO,EAAEc,KAAKC,aAAa;QAEtC,IAAI,CAAClB,eAAeC,SAAS;YAC3BU,UAAUQ,IAAI,CAACxB,gBAAgBC;YAC/B;QACF;QAEA,MAAMwB,mBAAmBvB,qBAAqBe,QAAQS,IAAI;QAC1D,MAAMC,iBAAiBlC,kBACrBgC,kBACA,cACA,gBACA,iBACArB,OAAO,CAAC,OAAO;QACjB,MAAMwB,kBAAkBnC,kBACtBgC,kBACA,QACA,iBACA,sBACArB,OAAO,CAAC,OAAO;QAEjB,MAAM,EAAEK,SAASoB,QAAQ,EAAE,GAAGrB,SAAS,GAAGF,OAAOE,OAAO;QACxD,MAAM,EAAEI,WAAWkB,UAAU,EAAE,GAAGC,MAAM,GAAGzB;QAE3CW,QAAQI,OAAO,CAACvB,gBAAgB,GAAG;YACjC,GAAGiC,IAAI;YACP,2EAA2E;YAC3E,2DAA2D;YAC3DC,QAAQ;gBAAC;gBAAW;aAAc;YAClC,wEAAwE;YACxE,8DAA8D;YAC9DC,SAAS,EAAE;YACXzB,SAAS;gBACP,GAAGA,OAAO;gBACVE,UAAU;oBACR;wBAAED,SAAS,CAAC,aAAa,EAAEkB,gBAAgB;wBAAEO,gBAAgB;oBAAM;oBACnE;oBACAnC;iBACD;gBACDoC,UAAU;gBACVb,KAAK;oBACH,GAAGd,QAAQc,GAAG;oBACdC,aAAaK;oBACbQ,qBAAqBT;gBACvB;YACF;QACF;QAEAjC,2BACEqB,MACAd,aACAgB;IAEJ;IAEA,MAAMpB,qBAAqBkB;IAE3B,OAAO;QAAEC;IAAU;AACrB"}

package/src/migrations/v1.0.0-rc.97/0004-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/v1.0.0-rc.97/0004-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/v1.0.0-rc.97/0004-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/v1.0.0-rc.97/0004-py-lambda-powertools-context/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/v1.0.0-rc.97/0004-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/v1.0.0-rc.97/0005-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/v1.0.0-rc.97/0005-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/v1.0.0-rc.97/0005-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/v1.0.0-rc.97/0005-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/v1.0.0-rc.97/0005-smithy-extension-trait-aliases/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/v1.0.0-rc.97/0005-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/v1.0.0-rc.97/0006-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/v1.0.0-rc.97/0006-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/v1.0.0-rc.97/0006-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/v1.0.0-rc.97/0006-script-project-quality-gates/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/v1.0.0-rc.97/0006-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/preset/__snapshots__/generator.spec.ts.snap

@@ -253,7 +253,7 @@ export default {
 
 exports[`preset generator > should run successfully > biome.json 1`] = `
 "{
-  "$schema": "https://biomejs.dev/schemas/2.5.11/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.5.12/schema.json",
   "root": true,
   "formatter": {
     "enabled": true,
@@ -422,7 +422,7 @@ catalog:
   '@nx/js': 23.2.0
   '@nx/workspace': 23.2.0
   typescript: ~6.0.3
-  '@biomejs/biome': 2.5.11
+  '@biomejs/biome': 2.5.12
   '@aws/nx-plugin': ^0.0.0
   '@aws/nx-plugin-mcp': ^0.0.0
 "

package/src/preset/generator.js

@@ -1,23 +1,19 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { joinPathFragments, OverwriteStrategy, updateJson } from "@nx/devkit";
+ */ import { OverwriteStrategy, updateJson } from "@nx/devkit";
 import { execSync } from "child_process";
 import enquirer from "enquirer";
-import { readFileSync } from "fs";
 import { ensureAwsNxPluginConfig, updateAwsNxPluginConfig } from "../utils/config/utils.js";
 import { declareDependencies } from "../utils/declared-dependencies.js";
-import { addDependenciesToPackageJson } from "../utils/dependencies.js";
 import { formatFilesInSubtree } from "../utils/format.js";
+import { GIT_SECRETS_DEPENDENCIES, setUpGitSecrets } from "../utils/git-secrets.js";
 import { applyWorkspaceInit, INIT_DEPENDENCIES } from "../utils/init.js";
 import { installDependencies } from "../utils/install.js";
 import { getGeneratorInfo } from "../utils/nx.js";
-import { withVersions } from "../utils/versions.js";
 export const DEPENDENCIES = declareDependencies()({
     ts: [
-        {
-            name: 'husky'
-        },
+        ...GIT_SECRETS_DEPENDENCIES,
         ...INIT_DEPENDENCIES
     ]
 });
@@ -68,23 +64,6 @@ export const PRESET_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
         return false;
     }
 }
-const setUpGitSecrets = (tree)=>{
-    const gitSecretsDir = joinPathFragments(import.meta.dirname, 'git-secrets-files', 'git-secrets-dir');
-    const huskyDir = joinPathFragments(import.meta.dirname, 'git-secrets-files', 'husky-dir');
-    tree.write('.git-secrets/git-secrets', readFileSync(joinPathFragments(gitSecretsDir, 'git-secrets'), 'utf-8'));
-    tree.write('.husky/pre-commit', readFileSync(joinPathFragments(huskyDir, 'pre-commit'), 'utf-8'));
-    tree.write('.gitallowed', '\\.git-secrets/git-secrets:\n');
-    updateJson(tree, 'package.json', (json)=>({
-            ...json,
-            scripts: {
-                ...json.scripts,
-                prepare: 'husky'
-            }
-        }));
-    addDependenciesToPackageJson(tree, {}, withVersions(DEPENDENCIES, [
-        'husky'
-    ]));
-};
 export const presetGenerator = async (tree, { iac, gitSecrets, mcp, containers, module, catalog, preferInstallDependencies })=>{
     if (isAmazonian() && !process.env.VITEST && !process.env.CI && process.env.NX_DRY_RUN !== 'true' && process.env.NX_INTERACTIVE !== 'false') {
         const { engagementId } = await enquirer.prompt([
@@ -126,7 +105,7 @@ export const presetGenerator = async (tree, { iac, gitSecrets, mcp, containers,
     tree.delete('libs/.gitkeep');
     tree.write('packages/.gitkeep', '');
     if (gitSecrets !== false) {
-        setUpGitSecrets(tree);
+        setUpGitSecrets(tree, DEPENDENCIES);
     }
     await formatFilesInSubtree(tree);
     return ()=>installDependencies(tree, preferInstallDependencies, {

package/src/preset/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/preset/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { execSync } from 'child_process';\nimport enquirer from 'enquirer';\nimport { readFileSync } from 'fs';\nimport {\n  ensureAwsNxPluginConfig,\n  updateAwsNxPluginConfig,\n} from '../utils/config/utils.js';\nimport { declareDependencies } from '../utils/declared-dependencies.js';\nimport { addDependenciesToPackageJson } from '../utils/dependencies.js';\nimport { formatFilesInSubtree } from '../utils/format.js';\nimport { applyWorkspaceInit, INIT_DEPENDENCIES } from '../utils/init.js';\nimport { installDependencies } from '../utils/install.js';\nimport { getGeneratorInfo, type NxGeneratorInfo } from '../utils/nx.js';\nimport { withVersions } from '../utils/versions.js';\nimport type { PresetGeneratorSchema } from './schema';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [{ name: 'husky' }, ...INIT_DEPENDENCIES],\n});\n\nexport const PRESET_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Determines if the current user is an Amazon employee based on their git configuration.\n *\n * This function checks the git user email configuration to identify Amazon employees\n * by looking for email addresses with Amazon domains (e.g., @amazon.com, @amazon.co.uk).\n *\n * @returns {boolean} True if the user's git email has an Amazon domain, false otherwise\n *\n * @example\n * // Returns true for Amazon employee emails\n * // git config user.email = \"john.doe@amazon.com\"\n * isAmazonian(); // true\n *\n * @example\n * // Returns false for non-Amazon emails\n * // git config user.email = \"user@example.com\"\n * isAmazonian(); // false\n *\n * @example\n * // Returns false when git config is not available or throws an error\n * isAmazonian(); // false\n */\nexport function isAmazonian(): boolean {\n  try {\n    // Execute git command to retrieve the user's configured email address\n    const gitEmail = execSync('git config user.email', {\n      encoding: 'utf8',\n    }).trim();\n\n    // Return false if no email is configured\n    if (!gitEmail) {\n      return false;\n    }\n\n    // Split email address to extract domain part\n    const emailParts = gitEmail.split('@');\n    if (emailParts.length < 2) {\n      return false;\n    }\n\n    // Extract domain and normalize to lowercase for comparison\n    const domain = emailParts[1].toLowerCase();\n\n    // Check if domain starts with 'amazon.' (covers amazon.com, amazon.co.uk, etc.)\n    return domain.startsWith('amazon.');\n  } catch (error) {\n    // Return false if git command fails or any other error occurs\n    // This handles cases where git is not installed or configured\n    return false;\n  }\n}\n\nconst setUpGitSecrets = (tree: Tree) => {\n  const gitSecretsDir = joinPathFragments(\n    import.meta.dirname,\n    'git-secrets-files',\n    'git-secrets-dir',\n  );\n  const huskyDir = joinPathFragments(\n    import.meta.dirname,\n    'git-secrets-files',\n    'husky-dir',\n  );\n\n  tree.write(\n    '.git-secrets/git-secrets',\n    readFileSync(joinPathFragments(gitSecretsDir, 'git-secrets'), 'utf-8'),\n  );\n  tree.write(\n    '.husky/pre-commit',\n    readFileSync(joinPathFragments(huskyDir, 'pre-commit'), 'utf-8'),\n  );\n  tree.write('.gitallowed', '\\\\.git-secrets/git-secrets:\\n');\n\n  updateJson(tree, 'package.json', (json) => ({\n    ...json,\n    scripts: {\n      ...json.scripts,\n      prepare: 'husky',\n    },\n  }));\n\n  addDependenciesToPackageJson(tree, {}, withVersions(DEPENDENCIES, ['husky']));\n};\n\nexport const presetGenerator = async (\n  tree: Tree,\n  {\n    iac,\n    gitSecrets,\n    mcp,\n    containers,\n    module,\n    catalog,\n    preferInstallDependencies,\n  }: PresetGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  if (\n    isAmazonian() &&\n    !process.env.VITEST &&\n    !process.env.CI &&\n    process.env.NX_DRY_RUN !== 'true' &&\n    process.env.NX_INTERACTIVE !== 'false'\n  ) {\n    const { engagementId } = await enquirer.prompt<{ engagementId?: string }>([\n      {\n        name: 'engagementId',\n        message: 'Please enter your engagementId (if known)',\n        type: 'input',\n        initial: 'None',\n      },\n    ]);\n\n    if (engagementId != 'None') {\n      await ensureAwsNxPluginConfig(tree);\n      await updateAwsNxPluginConfig(tree, { tags: [engagementId] });\n    }\n  }\n\n  // The preset owns the greenfield workspace's module format: write the root\n  // `type` explicitly from the chosen `--module` so later generators can\n  // infer it. The `init` generator never touches an existing workspace's\n  // `type` field.\n  updateJson(tree, 'package.json', (packageJson) => ({\n    ...packageJson,\n    type: (module ?? 'esm') === 'esm' ? 'module' : 'commonjs',\n  }));\n\n  // Apply the deterministic workspace configuration shared with the `init`\n  // generator. The preset owns the README of a greenfield workspace.\n  await applyWorkspaceInit(\n    tree,\n    {\n      iac,\n      containers,\n      mcp,\n      catalogs: catalog ?? true,\n      readmeOverwriteStrategy: OverwriteStrategy.Overwrite,\n      overwriteScripts: true,\n    },\n    DEPENDENCIES,\n  );\n\n  tree.delete('apps/.gitkeep');\n  tree.delete('libs/.gitkeep');\n  tree.write('packages/.gitkeep', '');\n\n  if (gitSecrets !== false) {\n    setUpGitSecrets(tree);\n  }\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default presetGenerator;\n"],"names":["joinPathFragments","OverwriteStrategy","updateJson","execSync","enquirer","readFileSync","ensureAwsNxPluginConfig","updateAwsNxPluginConfig","declareDependencies","addDependenciesToPackageJson","formatFilesInSubtree","applyWorkspaceInit","INIT_DEPENDENCIES","installDependencies","getGeneratorInfo","withVersions","DEPENDENCIES","ts","name","PRESET_GENERATOR_INFO","filename","isAmazonian","gitEmail","encoding","trim","emailParts","split","length","domain","toLowerCase","startsWith","error","setUpGitSecrets","tree","gitSecretsDir","dirname","huskyDir","write","json","scripts","prepare","presetGenerator","iac","gitSecrets","mcp","containers","module","catalog","preferInstallDependencies","process","env","VITEST","CI","NX_DRY_RUN","NX_INTERACTIVE","engagementId","prompt","message","type","initial","tags","packageJson","catalogs","readmeOverwriteStrategy","Overwrite","overwriteScripts","delete","languages"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,iBAAiB,EACjBC,iBAAiB,EAEjBC,UAAU,QACL,aAAa;AACpB,SAASC,QAAQ,QAAQ,gBAAgB;AACzC,OAAOC,cAAc,WAAW;AAChC,SAASC,YAAY,QAAQ,KAAK;AAClC,SACEC,uBAAuB,EACvBC,uBAAuB,QAClB,2BAA2B;AAClC,SAASC,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,4BAA4B,QAAQ,2BAA2B;AACxE,SAASC,oBAAoB,QAAQ,qBAAqB;AAC1D,SAASC,kBAAkB,EAAEC,iBAAiB,QAAQ,mBAAmB;AACzE,SAASC,mBAAmB,QAAQ,sBAAsB;AAC1D,SAASC,gBAAgB,QAA8B,iBAAiB;AACxE,SAASC,YAAY,QAAQ,uBAAuB;AAGpD,OAAO,MAAMC,eAAeR,sBAAsB;IAChDS,IAAI;QAAC;YAAEC,MAAM;QAAQ;WAAMN;KAAkB;AAC/C,GAAG;AAEH,OAAO,MAAMO,wBAAyCL,iBACpD,YAAYM,QAAQ,EACpB;AAEF;;;;;;;;;;;;;;;;;;;;;CAqBC,GACD,OAAO,SAASC;IACd,IAAI;QACF,sEAAsE;QACtE,MAAMC,WAAWnB,SAAS,yBAAyB;YACjDoB,UAAU;QACZ,GAAGC,IAAI;QAEP,yCAAyC;QACzC,IAAI,CAACF,UAAU;YACb,OAAO;QACT;QAEA,6CAA6C;QAC7C,MAAMG,aAAaH,SAASI,KAAK,CAAC;QAClC,IAAID,WAAWE,MAAM,GAAG,GAAG;YACzB,OAAO;QACT;QAEA,2DAA2D;QAC3D,MAAMC,SAASH,UAAU,CAAC,EAAE,CAACI,WAAW;QAExC,gFAAgF;QAChF,OAAOD,OAAOE,UAAU,CAAC;IAC3B,EAAE,OAAOC,OAAO;QACd,8DAA8D;QAC9D,8DAA8D;QAC9D,OAAO;IACT;AACF;AAEA,MAAMC,kBAAkB,CAACC;IACvB,MAAMC,gBAAgBlC,kBACpB,YAAYmC,OAAO,EACnB,qBACA;IAEF,MAAMC,WAAWpC,kBACf,YAAYmC,OAAO,EACnB,qBACA;IAGFF,KAAKI,KAAK,CACR,4BACAhC,aAAaL,kBAAkBkC,eAAe,gBAAgB;IAEhED,KAAKI,KAAK,CACR,qBACAhC,aAAaL,kBAAkBoC,UAAU,eAAe;IAE1DH,KAAKI,KAAK,CAAC,eAAe;IAE1BnC,WAAW+B,MAAM,gBAAgB,CAACK,OAAU,CAAA;YAC1C,GAAGA,IAAI;YACPC,SAAS;gBACP,GAAGD,KAAKC,OAAO;gBACfC,SAAS;YACX;QACF,CAAA;IAEA/B,6BAA6BwB,MAAM,CAAC,GAAGlB,aAAaC,cAAc;QAAC;KAAQ;AAC7E;AAEA,OAAO,MAAMyB,kBAAkB,OAC7BR,MACA,EACES,GAAG,EACHC,UAAU,EACVC,GAAG,EACHC,UAAU,EACVC,MAAM,EACNC,OAAO,EACPC,yBAAyB,EACH;IAExB,IACE3B,iBACA,CAAC4B,QAAQC,GAAG,CAACC,MAAM,IACnB,CAACF,QAAQC,GAAG,CAACE,EAAE,IACfH,QAAQC,GAAG,CAACG,UAAU,KAAK,UAC3BJ,QAAQC,GAAG,CAACI,cAAc,KAAK,SAC/B;QACA,MAAM,EAAEC,YAAY,EAAE,GAAG,MAAMnD,SAASoD,MAAM,CAA4B;YACxE;gBACEtC,MAAM;gBACNuC,SAAS;gBACTC,MAAM;gBACNC,SAAS;YACX;SACD;QAED,IAAIJ,gBAAgB,QAAQ;YAC1B,MAAMjD,wBAAwB2B;YAC9B,MAAM1B,wBAAwB0B,MAAM;gBAAE2B,MAAM;oBAACL;iBAAa;YAAC;QAC7D;IACF;IAEA,2EAA2E;IAC3E,uEAAuE;IACvE,uEAAuE;IACvE,gBAAgB;IAChBrD,WAAW+B,MAAM,gBAAgB,CAAC4B,cAAiB,CAAA;YACjD,GAAGA,WAAW;YACdH,MAAM,AAACZ,CAAAA,UAAU,KAAI,MAAO,QAAQ,WAAW;QACjD,CAAA;IAEA,yEAAyE;IACzE,mEAAmE;IACnE,MAAMnC,mBACJsB,MACA;QACES;QACAG;QACAD;QACAkB,UAAUf,WAAW;QACrBgB,yBAAyB9D,kBAAkB+D,SAAS;QACpDC,kBAAkB;IACpB,GACAjD;IAGFiB,KAAKiC,MAAM,CAAC;IACZjC,KAAKiC,MAAM,CAAC;IACZjC,KAAKI,KAAK,CAAC,qBAAqB;IAEhC,IAAIM,eAAe,OAAO;QACxBX,gBAAgBC;IAClB;IAEA,MAAMvB,qBAAqBuB;IAC3B,OAAO,IACLpB,oBAAoBoB,MAAMe,2BAA2B;YACnDmB,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAEF,eAAe1B,gBAAgB"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/preset/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  OverwriteStrategy,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { execSync } from 'child_process';\nimport enquirer from 'enquirer';\nimport {\n  ensureAwsNxPluginConfig,\n  updateAwsNxPluginConfig,\n} from '../utils/config/utils.js';\nimport { declareDependencies } from '../utils/declared-dependencies.js';\nimport { formatFilesInSubtree } from '../utils/format.js';\nimport {\n  GIT_SECRETS_DEPENDENCIES,\n  setUpGitSecrets,\n} from '../utils/git-secrets.js';\nimport { applyWorkspaceInit, INIT_DEPENDENCIES } from '../utils/init.js';\nimport { installDependencies } from '../utils/install.js';\nimport { getGeneratorInfo, type NxGeneratorInfo } from '../utils/nx.js';\nimport type { PresetGeneratorSchema } from './schema';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [...GIT_SECRETS_DEPENDENCIES, ...INIT_DEPENDENCIES],\n});\n\nexport const PRESET_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Determines if the current user is an Amazon employee based on their git configuration.\n *\n * This function checks the git user email configuration to identify Amazon employees\n * by looking for email addresses with Amazon domains (e.g., @amazon.com, @amazon.co.uk).\n *\n * @returns {boolean} True if the user's git email has an Amazon domain, false otherwise\n *\n * @example\n * // Returns true for Amazon employee emails\n * // git config user.email = \"john.doe@amazon.com\"\n * isAmazonian(); // true\n *\n * @example\n * // Returns false for non-Amazon emails\n * // git config user.email = \"user@example.com\"\n * isAmazonian(); // false\n *\n * @example\n * // Returns false when git config is not available or throws an error\n * isAmazonian(); // false\n */\nexport function isAmazonian(): boolean {\n  try {\n    // Execute git command to retrieve the user's configured email address\n    const gitEmail = execSync('git config user.email', {\n      encoding: 'utf8',\n    }).trim();\n\n    // Return false if no email is configured\n    if (!gitEmail) {\n      return false;\n    }\n\n    // Split email address to extract domain part\n    const emailParts = gitEmail.split('@');\n    if (emailParts.length < 2) {\n      return false;\n    }\n\n    // Extract domain and normalize to lowercase for comparison\n    const domain = emailParts[1].toLowerCase();\n\n    // Check if domain starts with 'amazon.' (covers amazon.com, amazon.co.uk, etc.)\n    return domain.startsWith('amazon.');\n  } catch (error) {\n    // Return false if git command fails or any other error occurs\n    // This handles cases where git is not installed or configured\n    return false;\n  }\n}\n\nexport const presetGenerator = async (\n  tree: Tree,\n  {\n    iac,\n    gitSecrets,\n    mcp,\n    containers,\n    module,\n    catalog,\n    preferInstallDependencies,\n  }: PresetGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  if (\n    isAmazonian() &&\n    !process.env.VITEST &&\n    !process.env.CI &&\n    process.env.NX_DRY_RUN !== 'true' &&\n    process.env.NX_INTERACTIVE !== 'false'\n  ) {\n    const { engagementId } = await enquirer.prompt<{ engagementId?: string }>([\n      {\n        name: 'engagementId',\n        message: 'Please enter your engagementId (if known)',\n        type: 'input',\n        initial: 'None',\n      },\n    ]);\n\n    if (engagementId != 'None') {\n      await ensureAwsNxPluginConfig(tree);\n      await updateAwsNxPluginConfig(tree, { tags: [engagementId] });\n    }\n  }\n\n  // The preset owns the greenfield workspace's module format: write the root\n  // `type` explicitly from the chosen `--module` so later generators can\n  // infer it. The `init` generator never touches an existing workspace's\n  // `type` field.\n  updateJson(tree, 'package.json', (packageJson) => ({\n    ...packageJson,\n    type: (module ?? 'esm') === 'esm' ? 'module' : 'commonjs',\n  }));\n\n  // Apply the deterministic workspace configuration shared with the `init`\n  // generator. The preset owns the README of a greenfield workspace.\n  await applyWorkspaceInit(\n    tree,\n    {\n      iac,\n      containers,\n      mcp,\n      catalogs: catalog ?? true,\n      readmeOverwriteStrategy: OverwriteStrategy.Overwrite,\n      overwriteScripts: true,\n    },\n    DEPENDENCIES,\n  );\n\n  tree.delete('apps/.gitkeep');\n  tree.delete('libs/.gitkeep');\n  tree.write('packages/.gitkeep', '');\n\n  if (gitSecrets !== false) {\n    setUpGitSecrets(tree, DEPENDENCIES);\n  }\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default presetGenerator;\n"],"names":["OverwriteStrategy","updateJson","execSync","enquirer","ensureAwsNxPluginConfig","updateAwsNxPluginConfig","declareDependencies","formatFilesInSubtree","GIT_SECRETS_DEPENDENCIES","setUpGitSecrets","applyWorkspaceInit","INIT_DEPENDENCIES","installDependencies","getGeneratorInfo","DEPENDENCIES","ts","PRESET_GENERATOR_INFO","filename","isAmazonian","gitEmail","encoding","trim","emailParts","split","length","domain","toLowerCase","startsWith","error","presetGenerator","tree","iac","gitSecrets","mcp","containers","module","catalog","preferInstallDependencies","process","env","VITEST","CI","NX_DRY_RUN","NX_INTERACTIVE","engagementId","prompt","name","message","type","initial","tags","packageJson","catalogs","readmeOverwriteStrategy","Overwrite","overwriteScripts","delete","write","languages"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,iBAAiB,EAEjBC,UAAU,QACL,aAAa;AACpB,SAASC,QAAQ,QAAQ,gBAAgB;AACzC,OAAOC,cAAc,WAAW;AAChC,SACEC,uBAAuB,EACvBC,uBAAuB,QAClB,2BAA2B;AAClC,SAASC,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,oBAAoB,QAAQ,qBAAqB;AAC1D,SACEC,wBAAwB,EACxBC,eAAe,QACV,0BAA0B;AACjC,SAASC,kBAAkB,EAAEC,iBAAiB,QAAQ,mBAAmB;AACzE,SAASC,mBAAmB,QAAQ,sBAAsB;AAC1D,SAASC,gBAAgB,QAA8B,iBAAiB;AAGxE,OAAO,MAAMC,eAAeR,sBAAsB;IAChDS,IAAI;WAAIP;WAA6BG;KAAkB;AACzD,GAAG;AAEH,OAAO,MAAMK,wBAAyCH,iBACpD,YAAYI,QAAQ,EACpB;AAEF;;;;;;;;;;;;;;;;;;;;;CAqBC,GACD,OAAO,SAASC;IACd,IAAI;QACF,sEAAsE;QACtE,MAAMC,WAAWjB,SAAS,yBAAyB;YACjDkB,UAAU;QACZ,GAAGC,IAAI;QAEP,yCAAyC;QACzC,IAAI,CAACF,UAAU;YACb,OAAO;QACT;QAEA,6CAA6C;QAC7C,MAAMG,aAAaH,SAASI,KAAK,CAAC;QAClC,IAAID,WAAWE,MAAM,GAAG,GAAG;YACzB,OAAO;QACT;QAEA,2DAA2D;QAC3D,MAAMC,SAASH,UAAU,CAAC,EAAE,CAACI,WAAW;QAExC,gFAAgF;QAChF,OAAOD,OAAOE,UAAU,CAAC;IAC3B,EAAE,OAAOC,OAAO;QACd,8DAA8D;QAC9D,8DAA8D;QAC9D,OAAO;IACT;AACF;AAEA,OAAO,MAAMC,kBAAkB,OAC7BC,MACA,EACEC,GAAG,EACHC,UAAU,EACVC,GAAG,EACHC,UAAU,EACVC,MAAM,EACNC,OAAO,EACPC,yBAAyB,EACH;IAExB,IACEnB,iBACA,CAACoB,QAAQC,GAAG,CAACC,MAAM,IACnB,CAACF,QAAQC,GAAG,CAACE,EAAE,IACfH,QAAQC,GAAG,CAACG,UAAU,KAAK,UAC3BJ,QAAQC,GAAG,CAACI,cAAc,KAAK,SAC/B;QACA,MAAM,EAAEC,YAAY,EAAE,GAAG,MAAMzC,SAAS0C,MAAM,CAA4B;YACxE;gBACEC,MAAM;gBACNC,SAAS;gBACTC,MAAM;gBACNC,SAAS;YACX;SACD;QAED,IAAIL,gBAAgB,QAAQ;YAC1B,MAAMxC,wBAAwB0B;YAC9B,MAAMzB,wBAAwByB,MAAM;gBAAEoB,MAAM;oBAACN;iBAAa;YAAC;QAC7D;IACF;IAEA,2EAA2E;IAC3E,uEAAuE;IACvE,uEAAuE;IACvE,gBAAgB;IAChB3C,WAAW6B,MAAM,gBAAgB,CAACqB,cAAiB,CAAA;YACjD,GAAGA,WAAW;YACdH,MAAM,AAACb,CAAAA,UAAU,KAAI,MAAO,QAAQ,WAAW;QACjD,CAAA;IAEA,yEAAyE;IACzE,mEAAmE;IACnE,MAAMzB,mBACJoB,MACA;QACEC;QACAG;QACAD;QACAmB,UAAUhB,WAAW;QACrBiB,yBAAyBrD,kBAAkBsD,SAAS;QACpDC,kBAAkB;IACpB,GACAzC;IAGFgB,KAAK0B,MAAM,CAAC;IACZ1B,KAAK0B,MAAM,CAAC;IACZ1B,KAAK2B,KAAK,CAAC,qBAAqB;IAEhC,IAAIzB,eAAe,OAAO;QACxBvB,gBAAgBqB,MAAMhB;IACxB;IAEA,MAAMP,qBAAqBuB;IAC3B,OAAO,IACLlB,oBAAoBkB,MAAMO,2BAA2B;YACnDqB,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAEF,eAAe7B,gBAAgB"}

package/src/py/agent/__snapshots__/generator.constructs.spec.ts.snap

@@ -766,11 +766,11 @@ dependencies = [
   "aws-lambda-powertools==3.34.0",
   "aws-opentelemetry-distro==0.19.0",
   "bedrock-agentcore==1.22.0",
-  "boto3==1.43.83",
+  "boto3==1.43.89",
   "fastapi==0.141.1",
   "mcp==1.28.1",
   "strands-agents==1.54.0",
-  "strands-agents-tools==0.8.7",
+  "strands-agents-tools==0.8.8",
   "uvicorn==0.52.4"
 ]
 

package/src/py/agent/__snapshots__/generator.frameworks.spec.ts.snap

@@ -704,15 +704,15 @@ dependencies = [
   "aws-lambda-powertools==3.34.0",
   "aws-opentelemetry-distro==0.19.0",
   "bedrock-agentcore==1.22.0",
-  "boto3==1.43.83",
+  "boto3==1.43.89",
   "fastapi==0.141.1",
   "mcp==1.28.1",
-  "langchain==1.3.18",
-  "langchain-aws==1.7.4",
+  "langchain==1.4.0",
+  "langchain-aws==1.7.5",
   "langgraph==1.2.11",
   "langgraph-checkpoint-sqlite==3.1.1",
   "aiosqlite==0.22.1",
-  "ag-ui-protocol==0.1.21",
+  "ag-ui-protocol==0.1.22",
   "ag-ui-langgraph==0.0.44",
   "uvicorn==0.52.4"
 ]

package/src/py/agent/__snapshots__/generator.protocols.spec.ts.snap

@@ -5,7 +5,7 @@ exports[`py#agent generator > should create DynamoDB checkpoint table and S3 off
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.62.0"
+      version = "6.63.0"
     }
     random = {
       source  = "hashicorp/random"
@@ -381,7 +381,7 @@ exports[`py#agent generator > should match snapshot for Terraform generated file
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.62.0"
+      version = "6.63.0"
     }
     random = {
       source  = "hashicorp/random"
@@ -704,7 +704,7 @@ exports[`py#agent generator > should match snapshot for Terraform generated file
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.62.0"
+      version = "6.63.0"
     }
     null = {
       source  = "hashicorp/null"
@@ -1063,7 +1063,7 @@ resource "null_resource" "runtime_ready" {
 
   provisioner "local-exec" {
     command = <<-EOT
-      uv run --with boto3==1.43.83 python -c "
+      uv run --with boto3==1.43.89 python -c "
 import boto3
 import json
 import os