@aws/nx-plugin 0.114.2 → 0.114.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "0.114.2",
+  "version": "0.114.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",

package/src/ts/rdb/__snapshots__/generator.spec.ts.snap

@@ -4099,9 +4099,13 @@ import {
 } from './constants.js';
 import { getDatabaseConfig } from './utils.js';
 
+let prismaClient: PrismaClient<Prisma.LogLevel> | undefined;
+
 export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
   log: LogOpts[] = ['warn', 'error'] as LogOpts[],
 ): Promise<PrismaClient<LogOpts>> => {
+  if (prismaClient) return prismaClient;
+
   if (process.env.SERVE_LOCAL === 'true') {
     const adapter = new PrismaPg(
       new Pool({
@@ -4113,10 +4117,11 @@ export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
         allowExitOnIdle: true,
       }),
     );
-    return new PrismaClient({
+    prismaClient = new PrismaClient({
       adapter,
       log,
-    }) as unknown as PrismaClient<LogOpts>;
+    }) as unknown as PrismaClient<Prisma.LogLevel>;
+    return prismaClient;
   }
 
   const { hostname, port, database, dbUser, region } =
@@ -4143,10 +4148,11 @@ export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
     }),
   );
 
-  return new PrismaClient({
+  prismaClient = new PrismaClient({
     adapter,
     log,
-  }) as unknown as PrismaClient<LogOpts>;
+  }) as unknown as PrismaClient<Prisma.LogLevel>;
+  return prismaClient;
 };
 "
 `;

package/src/ts/rdb/files/src/prisma.ts.template

@@ -60,9 +60,13 @@ export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
 };
 <%_ } else { _%>
 
+let prismaClient: PrismaClient<Prisma.LogLevel> | undefined;
+
 export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
   log: LogOpts[] = ['warn', 'error'] as LogOpts[],
 ): Promise<PrismaClient<LogOpts>> => {
+  if (prismaClient) return prismaClient;
+
   if (process.env.SERVE_LOCAL === 'true') {
     const adapter = new PrismaPg(
       new Pool({
@@ -74,10 +78,11 @@ export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
         allowExitOnIdle: true,
       }),
     );
-    return new PrismaClient({
+    prismaClient = new PrismaClient({
       adapter,
       log,
-    }) as unknown as PrismaClient<LogOpts>;
+    }) as unknown as PrismaClient<Prisma.LogLevel>;
+    return prismaClient;
   }
 
   const { hostname, port, database, dbUser, region } =
@@ -104,9 +109,10 @@ export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
     }),
   );
 
-  return new PrismaClient({
+  prismaClient = new PrismaClient({
     adapter,
     log,
-  }) as unknown as PrismaClient<LogOpts>;
+  }) as unknown as PrismaClient<Prisma.LogLevel>;
+  return prismaClient;
 };
 <%_ } _%>

package/src/ts/rdb/mcp-server-connection/__snapshots__/generator.spec.ts.snap

@@ -1,5 +1,26 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`ts#rdb mcp-server-connection generator > should add RDS CA bundle to Dockerfile 1`] = `
+"FROM public.ecr.aws/docker/library/node:lts-jod
+
+WORKDIR /app
+
+RUN npm install @aws/aws-distro-opentelemetry-node-autoinstrumentation@0.7.0
+
+COPY index.js /app
+
+RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates && \\
+    rm -rf /var/lib/apt/lists/* && \\
+    curl -fsSL "https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem" \\
+    -o /usr/local/share/ca-certificates/rds-bundle.crt && \\
+    update-ca-certificates
+
+EXPOSE 8000
+
+CMD [ "node", "--require", "@aws/aws-distro-opentelemetry-node-autoinstrumentation/register", "index.js" ]
+"
+`;
+
 exports[`ts#rdb mcp-server-connection generator > should add rdb serve-local dependency to the mcp-server prefixed serve-local 1`] = `
 {
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
@@ -31,6 +52,27 @@ exports[`ts#rdb mcp-server-connection generator > should add rdb serve-local dep
 }
 `;
 
+exports[`ts#rdb mcp-server-connection generator > should be idempotent for Dockerfile 1`] = `
+"FROM public.ecr.aws/docker/library/node:lts-jod
+
+WORKDIR /app
+
+RUN npm install @aws/aws-distro-opentelemetry-node-autoinstrumentation@0.7.0
+
+COPY index.js /app
+
+RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates && \\
+    rm -rf /var/lib/apt/lists/* && \\
+    curl -fsSL "https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem" \\
+    -o /usr/local/share/ca-certificates/rds-bundle.crt && \\
+    update-ca-certificates
+
+EXPOSE 8000
+
+CMD [ "node", "--require", "@aws/aws-distro-opentelemetry-node-autoinstrumentation/register", "index.js" ]
+"
+`;
+
 exports[`ts#rdb mcp-server-connection generator > should be idempotent for server.ts 1`] = `
 "import { getPrisma as getDb } from 'db';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';

package/src/ts/rdb/mcp-server-connection/generator.js

@@ -14,6 +14,7 @@ const names_1 = require("../../../utils/names");
 const lodash_camelcase_1 = tslib_1.__importDefault(require("lodash.camelcase"));
 const npm_scope_1 = require("../../../utils/npm-scope");
 const ast_1 = require("../../../utils/ast");
+const utils_1 = require("../utils");
 exports.TS_RDB_MCP_SERVER_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const tsRdbMcpServerConnectionGenerator = async (tree, options) => {
     const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
@@ -33,6 +34,9 @@ const tsRdbMcpServerConnectionGenerator = async (tree, options) => {
     const rdbPackageAlias = (0, npm_scope_1.toScopeAlias)(targetProject.name);
     const getterAlias = `getPrisma as get${rdbNamePascal}`;
     const serverPath = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src', mcpServerName, 'server.ts');
+    // Dockerfile: install RDS CA bundle for direct Aurora SSL connections
+    const dockerfilePath = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src', mcpServerName, 'Dockerfile');
+    (0, utils_1.injectRdsCaBundleIntoDockerfile)(tree, dockerfilePath);
     // server.ts: inject db inside createServer body
     if (tree.exists(serverPath)) {
         await (0, ast_1.addDestructuredImport)(tree, serverPath, [getterAlias], rdbPackageAlias);

package/src/ts/rdb/mcp-server-connection/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/mcp-server-connection/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAIoB;AAEpB,0CAK2B;AAC3B,oDAAyE;AACzE,kDAA6D;AAC7D,gDAAkD;AAClD,gFAAyC;AACzC,wDAAwD;AACxD,4CAAwE;AAE3D,QAAA,2CAA2C,GACtD,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,iCAAiC,GAAG,KAAK,EACpD,IAAU,EACV,OAAgD,EACjC,EAAE;IACjB,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI,IAAI,YAAY,CAAC;IACpE,MAAM,gBAAgB,GAAG,GAAG,aAAa,cAAc,CAAC;IAExD,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC9C,IAAA,sCAAiC,EAAC,aAAa,EAAE,gBAAgB,EAAE;YACjE,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,aAAa;SACtB,CAAC,CAAC;QACH,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,IAAA,0BAAS,EAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,aAAa,GAAG,IAAA,kBAAU,EAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,IAAA,wBAAY,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,mBAAmB,aAAa,EAAE,CAAC;IAEvD,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAClC,aAAa,CAAC,IAAI,EAClB,KAAK,EACL,aAAa,EACb,WAAW,CACZ,CAAC;IAEF,gDAAgD;IAChD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAA,2BAAqB,EACzB,IAAI,EACJ,UAAU,EACV,CAAC,WAAW,CAAC,EACb,eAAe,CAChB,CAAC;QAEF,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,UAAU,EACV;UACI,YAAY,eAAe,aAAa;;wCAEV,YAAY,eAAe,aAAa,QAAQ,CACnF,CAAC;QAEF,kDAAkD;QAClD,2EAA2E;QAC3E,MAAM,MAAM,GAAG,SAAS,YAAY,eAAe,aAAa,KAAK,CAAC;QACtE,MAAM,MAAM,GAAG,GAAG,YAAY,+BAA+B,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAE,CAAC;QAChD,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,YAAY,MAAM,CAAC,EAAE,CAAC;YACzE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,MAAM,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE;QAC1C,mDAA2C;KAC5C,CAAC,CAAC;IACH,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AArEW,QAAA,iCAAiC,qCAqE5C;AAEF,kBAAe,yCAAiC,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/mcp-server-connection/generator.ts"],"names":[],"mappings":"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"}

package/src/ts/rdb/strands-agent-connection/__snapshots__/generator.spec.ts.snap

@@ -1,5 +1,47 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`ts#rdb strands-agent-connection generator > should add RDS CA bundle to Dockerfile (A2A) 1`] = `
+"FROM public.ecr.aws/docker/library/node:lts-jod
+
+WORKDIR /app
+
+RUN npm install @aws/aws-distro-opentelemetry-node-autoinstrumentation@0.7.0
+
+COPY index.js /app
+
+RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates && \\
+    rm -rf /var/lib/apt/lists/* && \\
+    curl -fsSL "https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem" \\
+    -o /usr/local/share/ca-certificates/rds-bundle.crt && \\
+    update-ca-certificates
+
+EXPOSE 9000
+
+CMD [ "node", "--require", "@aws/aws-distro-opentelemetry-node-autoinstrumentation/register", "index.js" ]
+"
+`;
+
+exports[`ts#rdb strands-agent-connection generator > should add RDS CA bundle to Dockerfile (HTTP) 1`] = `
+"FROM public.ecr.aws/docker/library/node:lts-jod
+
+WORKDIR /app
+
+RUN npm install @aws/aws-distro-opentelemetry-node-autoinstrumentation@0.7.0
+
+COPY index.js /app
+
+RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates && \\
+    rm -rf /var/lib/apt/lists/* && \\
+    curl -fsSL "https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem" \\
+    -o /usr/local/share/ca-certificates/rds-bundle.crt && \\
+    update-ca-certificates
+
+EXPOSE 8080
+
+CMD [ "node", "--require", "@aws/aws-distro-opentelemetry-node-autoinstrumentation/register", "index.js" ]
+"
+`;
+
 exports[`ts#rdb strands-agent-connection generator > should add rdb serve-local dependency to the agent prefixed serve-local 1`] = `
 {
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
@@ -55,6 +97,27 @@ export const getAgent = async () => {
 "
 `;
 
+exports[`ts#rdb strands-agent-connection generator > should be idempotent for Dockerfile 1`] = `
+"FROM public.ecr.aws/docker/library/node:lts-jod
+
+WORKDIR /app
+
+RUN npm install @aws/aws-distro-opentelemetry-node-autoinstrumentation@0.7.0
+
+COPY index.js /app
+
+RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates && \\
+    rm -rf /var/lib/apt/lists/* && \\
+    curl -fsSL "https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem" \\
+    -o /usr/local/share/ca-certificates/rds-bundle.crt && \\
+    update-ca-certificates
+
+EXPOSE 8080
+
+CMD [ "node", "--require", "@aws/aws-distro-opentelemetry-node-autoinstrumentation/register", "index.js" ]
+"
+`;
+
 exports[`ts#rdb strands-agent-connection generator > should be idempotent for agent.ts injection 1`] = `
 "import { getPrisma as getDb } from 'db';
 import { Agent, tool } from '@strands-agents/sdk';

package/src/ts/rdb/strands-agent-connection/generator.js

@@ -14,6 +14,7 @@ const names_1 = require("../../../utils/names");
 const lodash_camelcase_1 = tslib_1.__importDefault(require("lodash.camelcase"));
 const npm_scope_1 = require("../../../utils/npm-scope");
 const ast_1 = require("../../../utils/ast");
+const utils_1 = require("../utils");
 exports.TS_RDB_STRANDS_AGENT_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const tsRdbStrandsAgentConnectionGenerator = async (tree, options) => {
     const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
@@ -34,6 +35,9 @@ const tsRdbStrandsAgentConnectionGenerator = async (tree, options) => {
     const getterAlias = `getPrisma as get${rdbNamePascal}`;
     const agentSourceDir = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src', agentName);
     const agentPath = (0, devkit_1.joinPathFragments)(agentSourceDir, 'agent.ts');
+    // Dockerfile: install RDS CA bundle for direct Aurora SSL connections
+    const dockerfilePath = (0, devkit_1.joinPathFragments)(agentSourceDir, 'Dockerfile');
+    (0, utils_1.injectRdsCaBundleIntoDockerfile)(tree, dockerfilePath);
     if (tree.exists(agentPath)) {
         await (0, ast_1.addDestructuredImport)(tree, agentPath, [getterAlias], rdbPackageAlias);
         // Block body form: export const getAgent = async () => { ... }

package/src/ts/rdb/strands-agent-connection/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/strands-agent-connection/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/strands-agent-connection/generator.ts"],"names":[],"mappings":"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"}

package/src/ts/rdb/utils.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Tree } from '@nx/devkit';
+export declare const injectRdsCaBundleIntoDockerfile: (tree: Tree, dockerfilePath: string) => void;

package/src/ts/rdb/utils.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectRdsCaBundleIntoDockerfile = void 0;
+const RDS_CA_RUN = [
+    'RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates && \\',
+    '    rm -rf /var/lib/apt/lists/* && \\',
+    '    curl -fsSL "https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem" \\',
+    '    -o /usr/local/share/ca-certificates/rds-bundle.crt && \\',
+    '    update-ca-certificates',
+].join('\n');
+const injectRdsCaBundleIntoDockerfile = (tree, dockerfilePath) => {
+    if (!tree.exists(dockerfilePath))
+        return;
+    const content = tree.read(dockerfilePath, 'utf-8');
+    if (content.includes('rds-bundle.crt'))
+        return;
+    tree.write(dockerfilePath, content.replace(/^(EXPOSE \d+)/m, `${RDS_CA_RUN}\n\n$1`));
+};
+exports.injectRdsCaBundleIntoDockerfile = injectRdsCaBundleIntoDockerfile;
+//# sourceMappingURL=utils.js.map

package/src/ts/rdb/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/rdb/utils.ts"],"names":[],"mappings":";;;AAMA,MAAM,UAAU,GAAG;IACjB,6FAA6F;IAC7F,uCAAuC;IACvC,uFAAuF;IACvF,8DAA8D;IAC9D,4BAA4B;CAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEN,MAAM,+BAA+B,GAAG,CAC7C,IAAU,EACV,cAAsB,EAChB,EAAE;IACR,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QAAE,OAAO;IACzC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAE,CAAC;IACpD,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAAE,OAAO;IAC/C,IAAI,CAAC,KAAK,CACR,cAAc,EACd,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,UAAU,QAAQ,CAAC,CACzD,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,+BAA+B,mCAW1C"}

package/src/ts/react-website/cognito-auth/__snapshots__/generator.spec.ts.snap

@@ -196,11 +196,13 @@ export class UserIdentity extends Construct {
     });
     // Retain the SMS role alongside the pool so the pool can still be updated and deleted manually
     const poolCfn = userPool.node.defaultChild as CfnResource;
-    const smsRoleCfn = userPool.node.findChild('smsRole').node
-      .defaultChild as CfnResource;
-    smsRoleCfn.cfnOptions.deletionPolicy = poolCfn.cfnOptions.deletionPolicy;
-    smsRoleCfn.cfnOptions.updateReplacePolicy =
-      poolCfn.cfnOptions.updateReplacePolicy;
+    const smsRoleNode = userPool.node.tryFindChild('smsRole');
+    if (smsRoleNode) {
+      const smsRoleCfn = smsRoleNode.node.defaultChild as CfnResource;
+      smsRoleCfn.cfnOptions.deletionPolicy = poolCfn.cfnOptions.deletionPolicy;
+      smsRoleCfn.cfnOptions.updateReplacePolicy =
+        poolCfn.cfnOptions.updateReplacePolicy;
+    }
     return userPool;
   };
 

package/src/utils/identity-constructs/files/cdk/core/user-identity.ts.template

@@ -108,12 +108,13 @@ export class UserIdentity extends Construct {
     });
     // Retain the SMS role alongside the pool so the pool can still be updated and deleted manually
     const poolCfn = userPool.node.defaultChild as CfnResource;
-    const smsRoleCfn = userPool.node
-      .findChild('smsRole')
-      .node.defaultChild as CfnResource;
-    smsRoleCfn.cfnOptions.deletionPolicy = poolCfn.cfnOptions.deletionPolicy;
-    smsRoleCfn.cfnOptions.updateReplacePolicy =
-      poolCfn.cfnOptions.updateReplacePolicy;
+    const smsRoleNode = userPool.node.tryFindChild('smsRole');
+    if (smsRoleNode) {
+      const smsRoleCfn = smsRoleNode.node.defaultChild as CfnResource;
+      smsRoleCfn.cfnOptions.deletionPolicy = poolCfn.cfnOptions.deletionPolicy;
+      smsRoleCfn.cfnOptions.updateReplacePolicy =
+        poolCfn.cfnOptions.updateReplacePolicy;
+    }
     return userPool;
   };