@aws/nx-plugin 1.0.0-rc.0 → 1.0.0-rc.10

package/src/ts/website/app/schema.json

@@ -43,53 +43,61 @@
       "description": "The sub directory the project is placed in. By default this is the project name.",
       "x-prompt": "Which sub directory do you want to create the project in? (By default this is the project name)"
     },
-    "uxProvider": {
+    "ux": {
       "type": "string",
       "description": "The preferred UX provider.",
-      "enum": ["None", "Cloudscape", "Shadcn"],
+      "enum": ["none", "cloudscape", "shadcn"],
       "x-priority": "important",
-      "default": "Cloudscape",
+      "default": "cloudscape",
       "x-prompt": {
         "message": "Which UX provider should we scaffold for this app?",
         "type": "list",
         "items": [
           {
-            "value": "None",
+            "value": "none",
             "label": "None (plain React/Vite without a UI kit)"
           },
           {
-            "value": "Cloudscape",
+            "value": "cloudscape",
             "label": "Cloudscape (AWS-first components with ready-made layouts)"
           },
           {
-            "value": "Shadcn",
+            "value": "shadcn",
             "label": "Shadcn (shared UI library under packages/common/shadcn)"
           }
         ],
-        "default": "Cloudscape"
+        "default": "cloudscape"
       }
     },
-    "enableTailwind": {
+    "tailwind": {
       "description": "Enable TailwindCSS for utility-first styling.",
       "type": "boolean",
       "default": true,
       "x-priority": "important",
       "x-prompt": "Would you like to enable TailwindCSS for additional styling capabilities?"
     },
-    "enableTanstackRouter": {
+    "tanstackRouter": {
       "description": "Enable Tanstack router for type-safe routing.",
       "type": "boolean",
       "default": true,
       "x-priority": "important",
       "x-prompt": "Would you like to enable Tanstack Router for type-safe routing?"
     },
-    "iacProvider": {
+    "infra": {
+      "type": "string",
+      "description": "The type of infrastructure to deploy your website with.",
+      "enum": ["cloudfront-s3", "none"],
+      "default": "cloudfront-s3",
+      "x-priority": "important",
+      "x-prompt": "What infrastructure would you like to deploy your website with?"
+    },
+    "iac": {
       "type": "string",
       "description": "The preferred IaC provider. By default this is inherited from your initial selection.",
-      "enum": ["Inherit", "CDK", "Terraform"],
+      "enum": ["inherit", "cdk", "terraform"],
       "x-priority": "important",
-      "default": "Inherit",
-      "x-prompt": "Which provider would you like to manage your infrastructure? (default: Inherit)"
+      "default": "inherit",
+      "x-prompt": "Which provider would you like to manage your infrastructure? (default: inherit)"
     }
   },
   "required": ["name"],

package/src/ts/website/auth/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
-import { TsWebsiteAuthGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../../utils/nx';
+import type { Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../../utils/nx';
+import type { TsWebsiteAuthGeneratorSchema } from './schema';
 export declare const TS_WEBSITE_AUTH_GENERATOR_INFO: NxGeneratorInfo;
 export declare function tsWebsiteAuthGenerator(tree: Tree, schema: TsWebsiteAuthGeneratorSchema): Promise<() => void>;
 export default tsWebsiteAuthGenerator;

package/src/ts/website/auth/generator.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TS_WEBSITE_AUTH_GENERATOR_INFO = void 0;
 exports.tsWebsiteAuthGenerator = tsWebsiteAuthGenerator;
-const generator_1 = require("../../react-website/cognito-auth/generator");
 const nx_1 = require("../../../utils/nx");
+const generator_1 = require("../../react-website/cognito-auth/generator");
 exports.TS_WEBSITE_AUTH_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 async function tsWebsiteAuthGenerator(tree, schema) {
     return (0, generator_1.tsReactWebsiteAuthGenerator)(tree, {
         project: schema.project,
         allowSignup: schema.allowSignup,
         cognitoDomain: schema.cognitoDomain,
-        iacProvider: schema.iacProvider,
+        iac: schema.iac,
     });
 }
 exports.default = tsWebsiteAuthGenerator;

package/src/ts/website/auth/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/website/auth/generator.ts"],"names":[],"mappings":";;;AAYA,wDAUC;AAhBD,0EAAyF;AACzF,0CAAsE;AAEzD,QAAA,8BAA8B,GACzC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,KAAK,UAAU,sBAAsB,CAC1C,IAAU,EACV,MAAoC;IAEpC,OAAO,IAAA,uCAA2B,EAAC,IAAI,EAAE;QACvC,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,WAAW,EAAE,MAAM,CAAC,WAAW;KAChC,CAAC,CAAC;AACL,CAAC;AAED,kBAAe,sBAAsB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/website/auth/generator.ts"],"names":[],"mappings":";;;AAYA,wDAUC;AAjBD,0CAA2E;AAC3E,0EAAyF;AAG5E,QAAA,8BAA8B,GACzC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,KAAK,UAAU,sBAAsB,CAC1C,IAAU,EACV,MAAoC;IAEpC,OAAO,IAAA,uCAA2B,EAAC,IAAI,EAAE;QACvC,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,GAAG,EAAE,MAAM,CAAC,GAAG;KAChB,CAAC,CAAC;AACL,CAAC;AAED,kBAAe,sBAAsB,CAAC"}

package/src/ts/website/auth/schema.d.ts

@@ -2,11 +2,11 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { IacProviderOption } from '../../../utils/iac';
+import { IacOption } from '../../../utils/iac';
 
 export interface TsWebsiteAuthGeneratorSchema {
   project: string;
   allowSignup: boolean;
   cognitoDomain?: string;
-  iacProvider: IacProviderOption;
+  iac: IacOption;
 }

package/src/ts/website/auth/schema.json

@@ -33,13 +33,13 @@
       "x-prompt": "Enable self signup?",
       "x-priority": "important"
     },
-    "iacProvider": {
+    "iac": {
       "type": "string",
       "description": "The preferred IaC provider. By default this is inherited from your initial selection.",
-      "enum": ["Inherit", "CDK", "Terraform"],
+      "enum": ["inherit", "cdk", "terraform"],
       "x-priority": "important",
-      "default": "Inherit",
-      "x-prompt": "Which provider would you like to manage your infrastructure? (default: Inherit)"
+      "default": "inherit",
+      "x-prompt": "Which provider would you like to manage your infrastructure? (default: inherit)"
     }
   },
   "required": ["project"]

package/src/utils/agent-connection/agent-connection.d.ts

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 export declare const AGENT_CONNECTION_PROJECT_DIR: string;
 /**
  * Get the directory of the shared Python agent-connection project.

package/src/utils/agent-connection/agent-connection.js

@@ -15,10 +15,10 @@ const tslib_1 = require("tslib");
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const generator_1 = tslib_1.__importDefault(require("../../ts/lib/generator"));
-const generator_2 = tslib_1.__importStar(require("../../py/project/generator"));
-const py_1 = require("../py");
+const generator_1 = tslib_1.__importStar(require("../../py/project/generator"));
+const generator_2 = tslib_1.__importDefault(require("../../ts/lib/generator"));
 const ast_1 = require("../ast");
+const py_1 = require("../py");
 /** Prefix a GritQL pattern with `language python` */
 const py = (pattern) => `language python\n${pattern}`;
 const AGENT_CONNECTION_DIR = 'agent-connection';
@@ -30,7 +30,7 @@ const PY_AGENT_CONNECTION_NAME = 'agent_connection';
  * Get the directory of the shared Python agent-connection project.
  */
 function getPythonAgentConnectionProjectDir(tree) {
-    const { dir } = (0, generator_2.getPyProjectDetails)(tree, {
+    const { dir } = (0, generator_1.getPyProjectDetails)(tree, {
         name: PY_AGENT_CONNECTION_NAME,
         directory: (0, devkit_1.joinPathFragments)(PACKAGES_DIR, COMMON_DIR),
     });
@@ -40,7 +40,7 @@ function getPythonAgentConnectionProjectDir(tree) {
  * Get the Python module name of the shared agent-connection project.
  */
 function getPythonAgentConnectionModuleName(tree) {
-    const { normalizedModuleName } = (0, generator_2.getPyProjectDetails)(tree, {
+    const { normalizedModuleName } = (0, generator_1.getPyProjectDetails)(tree, {
         name: PY_AGENT_CONNECTION_NAME,
         directory: (0, devkit_1.joinPathFragments)(PACKAGES_DIR, COMMON_DIR),
     });
@@ -50,7 +50,7 @@ function getPythonAgentConnectionModuleName(tree) {
  * Get the fully qualified Python package name of the shared agent-connection project.
  */
 function getPythonAgentConnectionPackageName(tree) {
-    const { fullyQualifiedName } = (0, generator_2.getPyProjectDetails)(tree, {
+    const { fullyQualifiedName } = (0, generator_1.getPyProjectDetails)(tree, {
         name: PY_AGENT_CONNECTION_NAME,
         directory: (0, devkit_1.joinPathFragments)(PACKAGES_DIR, COMMON_DIR),
     });
@@ -79,7 +79,7 @@ exports.PY_CORE_TEMPLATES = {
 async function ensureTypeScriptAgentConnectionProject(tree) {
     const projectJsonPath = (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'project.json');
     if (!tree.exists(projectJsonPath)) {
-        await (0, generator_1.default)(tree, {
+        await (0, generator_2.default)(tree, {
             name: AGENT_CONNECTION_DIR,
             directory: (0, devkit_1.joinPathFragments)(PACKAGES_DIR, COMMON_DIR),
         });
@@ -92,6 +92,7 @@ async function ensureTypeScriptAgentConnectionProject(tree) {
     // the agent-connection internals.
     await (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), './core/session-context.js');
     await (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), './core/with-session-id.js');
+    await (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), './core/model-errors.js');
 }
 /**
  * Emit one of the TypeScript core client templates (mcp or a2a) into the
@@ -112,10 +113,10 @@ async function ensurePythonAgentConnectionProject(tree) {
     const projectJsonPath = (0, devkit_1.joinPathFragments)(projectDir, 'project.json');
     if (!tree.exists(projectJsonPath)) {
         // Create the Python project using the standard py#project generator
-        await (0, generator_2.default)(tree, {
+        await (0, generator_1.default)(tree, {
             name: PY_AGENT_CONNECTION_NAME,
             directory: (0, devkit_1.joinPathFragments)(PACKAGES_DIR, COMMON_DIR),
-            projectType: 'library',
+            type: 'library',
         });
     }
     const moduleDir = (0, devkit_1.joinPathFragments)(projectDir, moduleName);
@@ -139,8 +140,13 @@ async function ensurePythonAgentConnectionProject(tree) {
     await addPythonReExport(tree, moduleInitPath, '.core.session_context', 'get_current_session_id');
     await addPythonReExport(tree, moduleInitPath, '.core.session_context', 'session_id_context');
     await addPythonReExport(tree, moduleInitPath, '.core.with_session_id', 'with_session_id');
-    // Shared core helpers depend on aws-lambda-powertools for AppConfig access.
-    (0, py_1.addDependenciesToPyProjectToml)(tree, projectDir, ['aws-lambda-powertools']);
+    await addPythonReExport(tree, moduleInitPath, '.core.model_errors', 'log_model_errors');
+    // Shared core helpers depend on aws-lambda-powertools for AppConfig access
+    // and strands-agents for the model error-logging hook.
+    (0, py_1.addDependenciesToPyProjectToml)(tree, projectDir, [
+        'aws-lambda-powertools',
+        'strands-agents',
+    ]);
 }
 /**
  * Emit a Python core client template (mcp / a2a / shared auth) into the

package/src/utils/agent-connection/agent-connection.js.map

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

package/src/utils/agent-connection/files/core-runtime-config/model-errors.ts.template

@@ -0,0 +1,36 @@
+import { AfterModelCallEvent, type LocalAgent } from '@strands-agents/sdk';
+
+const NO_CREDENTIALS =
+  'Unable to invoke the model: no AWS credentials found. Configure credentials ' +
+  '(e.g. run `aws configure`, set AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY / ' +
+  'AWS_SESSION_TOKEN, or assume a role) before running the agent.';
+const ACCESS_DENIED =
+  'Unable to invoke the model: access denied. Grant your AWS principal permission ' +
+  'to call bedrock:InvokeModelWithResponseStream for your model.';
+
+// AWS SDK v3 errors are identified by their `name` rather than `instanceof`,
+// since the SDK may be loaded from more than one place. Strands wraps them in a
+// ModelError, so we check the error and its `cause` chain.
+const hasErrorNamed = (error: unknown, name: string): boolean => {
+  let current: unknown = error;
+  while (current instanceof Error) {
+    if (current.name === name) return true;
+    current = current.cause;
+  }
+  return false;
+};
+
+/** Logs model invocation errors, calling out missing credentials or denied permissions. */
+export const logModelErrors = (agent: LocalAgent): void => {
+  agent.addHook(AfterModelCallEvent, (event) => {
+    const error = event.error;
+    if (!error) return;
+    if (hasErrorNamed(error, 'CredentialsProviderError')) {
+      console.error(NO_CREDENTIALS);
+    } else if (hasErrorNamed(error, 'AccessDeniedException')) {
+      console.error(ACCESS_DENIED);
+    } else {
+      console.error(`Model invocation failed: ${error.message}`);
+    }
+  });
+};

package/src/utils/agent-connection/files/py-core-runtime-config/model_errors.py.template

@@ -0,0 +1,40 @@
+import logging
+
+from botocore.exceptions import ClientError, NoCredentialsError, PartialCredentialsError
+from strands.hooks import AfterModelCallEvent, HookRegistry
+
+logger = logging.getLogger(__name__)
+
+_NO_CREDENTIALS = (
+    "Unable to invoke the model: no AWS credentials found. Configure credentials "
+    "(e.g. run `aws configure`, set AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY / "
+    "AWS_SESSION_TOKEN, or assume a role) before running the agent."
+)
+_ACCESS_DENIED = (
+    "Unable to invoke the model: access denied. Grant your AWS principal permission "
+    "to call bedrock:InvokeModelWithResponseStream for your model."
+)
+
+
+def _is_access_denied(error: BaseException) -> bool:
+    return isinstance(error, ClientError) and error.response.get("Error", {}).get("Code") == "AccessDeniedException"
+
+
+class _LogModelErrors:
+    def register_hooks(self, registry: HookRegistry, **_kwargs) -> None:
+        registry.add_callback(AfterModelCallEvent, self._on_after_model_call)
+
+    @staticmethod
+    def _on_after_model_call(event: AfterModelCallEvent) -> None:
+        error = event.exception
+        if error is None:
+            return
+        if isinstance(error, (NoCredentialsError, PartialCredentialsError)):
+            logger.error(_NO_CREDENTIALS)
+        elif _is_access_denied(error):
+            logger.error(_ACCESS_DENIED)
+        else:
+            logger.error("Model invocation failed: %s", error)
+
+
+log_model_errors = _LogModelErrors()

package/src/utils/agent-core-constructs/agent-core-constructs.d.ts

@@ -2,13 +2,13 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
-import { IacProvider } from '../iac';
-import { ContainerEngine } from '../containers';
+import { type Tree } from '@nx/devkit';
+import type { Containers } from '../containers';
+import type { Iac } from '../iac';
 type IACProvider = {
-    iacProvider: IacProvider;
+    iac: Iac;
 };
-export type AgentCoreAuth = 'IAM' | 'Cognito';
+export type AgentCoreAuth = 'iam' | 'cognito';
 export interface AddAgentCoreInfraProps {
     nameClassName: string;
     nameKebabCase: string;
@@ -16,9 +16,9 @@ export interface AddAgentCoreInfraProps {
     dockerImageTag: string;
     dockerOutputDir: string;
     appDirectory: string;
-    serverProtocol: 'MCP' | 'HTTP' | 'A2A';
+    serverProtocol: 'mcp' | 'http' | 'a2a';
     auth: AgentCoreAuth;
-    containerEngine: ContainerEngine;
+    containers: Containers;
 }
 export interface AddMcpServerInfraProps {
     mcpServerNameClassName: string;
@@ -27,7 +27,7 @@ export interface AddMcpServerInfraProps {
     dockerImageTag: string;
     dockerOutputDir: string;
     auth: AgentCoreAuth;
-    containerEngine: ContainerEngine;
+    containers: Containers;
 }
 /**
  * Add an MCP server CDK construct
@@ -40,8 +40,8 @@ export interface AddAgentInfraProps {
     dockerImageTag: string;
     dockerOutputDir: string;
     auth: AgentCoreAuth;
-    serverProtocol?: 'HTTP' | 'A2A';
-    containerEngine: ContainerEngine;
+    serverProtocol?: 'http' | 'a2a';
+    containers: Containers;
 }
 /**
  * Add an agent CDK construct

package/src/utils/agent-core-constructs/agent-core-constructs.js

@@ -6,31 +6,21 @@ exports.addAgentInfra = exports.addMcpServerInfra = void 0;
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const shared_constructs_constants_1 = require("../shared-constructs-constants");
 const ast_1 = require("../ast");
+const nx_1 = require("../nx");
+const shared_constructs_constants_1 = require("../shared-constructs-constants");
 const addAgentCoreInfra = async (tree, options) => {
-    switch (options.iacProvider) {
-        case 'CDK':
+    switch (options.iac) {
+        case 'cdk':
             await addAgentCoreCDKInfra(tree, options);
             break;
-        case 'Terraform':
+        case 'terraform':
             addAgentCoreTerraformInfra(tree, options);
             break;
     }
     // Update shared constructs/terraform project configuration to depend on this project
-    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, options.iacProvider === 'CDK'
-        ? shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR
-        : shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'project.json'), (config) => {
-        if (!config.targets) {
-            config.targets = {};
-        }
-        if (!config.targets.build) {
-            config.targets.build = {};
-        }
-        config.targets.build.dependsOn = [
-            ...(config.targets.build.dependsOn ?? []).filter((t) => t !== `${options.projectName}:build`),
-            `${options.projectName}:build`,
-        ];
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, options.iac === 'cdk' ? shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR : shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'project.json'), (config) => {
+        (0, nx_1.addDependencyToTargetIfNotPresent)(config, 'build', `${options.projectName}:build`);
         return config;
     });
 };
@@ -45,7 +35,7 @@ const addAgentCoreCDKInfra = async (tree, options) => {
 };
 const addAgentCoreTerraformInfra = (tree, options) => {
     // Add the AgentCore shared module
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform', 'core', 'agent-core'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'src', 'core', 'agent-core'), { containerEngine: options.containerEngine }, {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform', 'core', 'agent-core'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'src', 'core', 'agent-core'), { containers: options.containers }, {
         overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
     });
     // Generate app specific agent core configuration
@@ -64,10 +54,10 @@ const addMcpServerInfra = async (tree, options) => {
         dockerOutputDir: options.dockerOutputDir,
         projectName: options.projectName,
         appDirectory: 'mcp-servers',
-        serverProtocol: 'MCP',
-        iacProvider: options.iacProvider,
+        serverProtocol: 'mcp',
+        iac: options.iac,
         auth: options.auth,
-        containerEngine: options.containerEngine,
+        containers: options.containers,
     });
 };
 exports.addMcpServerInfra = addMcpServerInfra;
@@ -82,10 +72,10 @@ const addAgentInfra = async (tree, options) => {
         dockerImageTag: options.dockerImageTag,
         dockerOutputDir: options.dockerOutputDir,
         appDirectory: 'agents',
-        serverProtocol: options.serverProtocol ?? 'HTTP',
-        iacProvider: options.iacProvider,
+        serverProtocol: options.serverProtocol ?? 'http',
+        iac: options.iac,
         auth: options.auth,
-        containerEngine: options.containerEngine,
+        containers: options.containers,
     });
 };
 exports.addAgentInfra = addAgentInfra;

package/src/utils/agent-core-constructs/agent-core-constructs.js.map

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

package/src/utils/agent-core-constructs/files/cdk/app/agent-core/__nameKebabCase__/__nameKebabCase__.ts.template

@@ -9,18 +9,18 @@ import {
   ProtocolType,
   Runtime,
   RuntimeProps,
-<%_ if (auth === 'Cognito') { _%>
+<%_ if (auth === 'cognito') { _%>
   RuntimeAuthorizerConfiguration,
 <%_ } _%>
 } from 'aws-cdk-lib/aws-bedrockagentcore';
-import { <%_ if (serverProtocol !== 'MCP') { _%>PolicyStatement, <%_ } _%>IGrantable, IPrincipal<%_ if (auth === 'IAM') { _%>, Grant<%_ } _%> } from 'aws-cdk-lib/aws-iam';
-<%_ if (auth === 'Cognito') { _%>
+import { <%_ if (serverProtocol !== 'mcp') { _%>PolicyStatement, <%_ } _%>IGrantable, IPrincipal<%_ if (auth === 'iam') { _%>, Grant<%_ } _%> } from 'aws-cdk-lib/aws-iam';
+<%_ if (auth === 'cognito') { _%>
 import { IUserPool, IUserPoolClient } from 'aws-cdk-lib/aws-cognito';
 <%_ } _%>
 import { RuntimeConfig } from '../../../core/runtime-config.js';
 import { findWorkspaceRoot } from '../../../core/workspace.js';
 
-<%_ if (auth === 'IAM') { _%>
+<%_ if (auth === 'iam') { _%>
 export type <%- nameClassName %>Props = Omit<
   RuntimeProps,
   | 'runtimeName'
@@ -28,7 +28,7 @@ export type <%- nameClassName %>Props = Omit<
   | 'agentRuntimeArtifact'
   | 'authorizerConfiguration'
 >;
-<%_ } else if (auth === 'Cognito') { _%>
+<%_ } else if (auth === 'cognito') { _%>
 export type <%- nameClassName %>Props = Omit<
   RuntimeProps,
   | 'runtimeName'
@@ -50,7 +50,7 @@ export class <%- nameClassName %> extends Construct implements IGrantable, IConn
   public readonly dockerImage: AgentRuntimeArtifact;
   public readonly agentCoreRuntime: Runtime;
 
-  constructor(scope: Construct, id: string, props<%_ if (auth !== 'Cognito') { _%>?<%_ } _%>: <%- nameClassName %>Props) {
+  constructor(scope: Construct, id: string, props<%_ if (auth !== 'cognito') { _%>?<%_ } _%>: <%- nameClassName %>Props) {
     super(scope, id);
 
     const rc = RuntimeConfig.ensure(this);
@@ -65,7 +65,7 @@ export class <%- nameClassName %> extends Construct implements IGrantable, IConn
       platform: Platform.LINUX_ARM64,
     });
 
-<%_ if (auth === 'Cognito') { _%>
+<%_ if (auth === 'cognito') { _%>
     const { identity, ...restProps } = props;
 
 <%_ } _%>
@@ -74,9 +74,9 @@ export class <%- nameClassName %> extends Construct implements IGrantable, IConn
         produce: () =>
           Names.uniqueResourceName(this.agentCoreRuntime, { maxLength: 40 }),
       }),
-      protocolConfiguration: ProtocolType.<%- serverProtocol %>,
+      protocolConfiguration: ProtocolType.<%- serverProtocol.toUpperCase() %>,
       agentRuntimeArtifact: this.dockerImage,
-<%_ if (auth === 'Cognito') { _%>
+<%_ if (auth === 'cognito') { _%>
       authorizerConfiguration: RuntimeAuthorizerConfiguration.usingCognito(
         identity.userPool,
         [identity.userPoolClient],
@@ -87,7 +87,7 @@ export class <%- nameClassName %> extends Construct implements IGrantable, IConn
 <%_ } _%>
       environmentVariables: {
         RUNTIME_CONFIG_APP_ID: rc.appConfigApplicationId,
-<%_ if (auth === 'Cognito') { _%>
+<%_ if (auth === 'cognito') { _%>
         ...restProps?.environmentVariables,
 <%_ } else { _%>
         ...props?.environmentVariables,
@@ -95,7 +95,7 @@ export class <%- nameClassName %> extends Construct implements IGrantable, IConn
       },
     });
 
-<%_ if (serverProtocol !== 'MCP') { _%>
+<%_ if (serverProtocol !== 'mcp') { _%>
     // Grant access for the agent to invoke bedrock models
     this.agentCoreRuntime.addToRolePolicy(
       new PolicyStatement({
@@ -132,7 +132,7 @@ export class <%- nameClassName %> extends Construct implements IGrantable, IConn
   public get connections(): Connections {
     return this.agentCoreRuntime.connections;
   }
-<%_ if (auth === 'IAM') { _%>
+<%_ if (auth === 'iam') { _%>
 
   /**
    * Grants IAM permissions to invoke this agent runtime.
@@ -146,7 +146,7 @@ export class <%- nameClassName %> extends Construct implements IGrantable, IConn
       grantee,
       actions: [
         'bedrock-agentcore:InvokeAgentRuntimeWithWebSocketStream',
-<%_ if (serverProtocol === 'A2A') { _%>
+<%_ if (serverProtocol === 'a2a') { _%>
         'bedrock-agentcore:GetAgentCard',
 <%_ } _%>
       ],

package/src/utils/agent-core-constructs/files/terraform/app/agent-core/__nameKebabCase__/__nameKebabCase__.tf.template

@@ -30,7 +30,7 @@ variable "appconfig_application_arn" {
   type        = string
 }
 
-<%_ if (auth === 'Cognito') { _%>
+<%_ if (auth === 'cognito') { _%>
 variable "user_pool_id" {
   description = "ID of the user pool for cognito authentication"
   type        = string
@@ -52,8 +52,8 @@ module "agent_core_runtime" {
   source = "../../../core/agent-core"
   agent_runtime_name = "<%= nameClassName %>"
   docker_image_tag = "<%= dockerImageTag %>"
-  server_protocol = "<%= serverProtocol %>"
-<%_ if (auth === 'Cognito') { _%>
+  server_protocol = "<%= serverProtocol.toUpperCase() %>"
+<%_ if (auth === 'cognito') { _%>
   authorizer_configuration = {
     custom_jwt_authorizer = {
       discovery_url   = "https://cognito-idp.${local.aws_region}.amazonaws.com/${var.user_pool_id}/.well-known/openid-configuration"
@@ -73,7 +73,7 @@ module "agent_core_runtime" {
         "appconfig:GetLatestConfiguration"
       ]
       Resource = ["${var.appconfig_application_arn}/*"]
-    }<% if (serverProtocol !== 'MCP') { %>,
+    }<% if (serverProtocol !== 'mcp') { %>,
     # Grant access for the agent to invoke bedrock models
     {
       Effect = "Allow"