@aws/nx-plugin 0.50.0 → 0.51.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/LICENSE-THIRD-PARTY +84 -336
  2. package/package.json +1 -1
  3. package/src/infra/app/__snapshots__/generator.spec.ts.snap +4 -4
  4. package/src/license/config.js +1 -1
  5. package/src/mcp-server/tools/create-workspace-command.js +2 -1
  6. package/src/mcp-server/tools/create-workspace-command.js.map +1 -1
  7. package/src/py/fast-api/__snapshots__/generator.spec.ts.snap +8 -8
  8. package/src/py/fast-api/generator.js +2 -2
  9. package/src/py/fast-api/generator.js.map +1 -1
  10. package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap +3 -3
  11. package/src/py/lambda-function/generator.js +3 -3
  12. package/src/py/lambda-function/generator.js.map +1 -1
  13. package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap +30 -79
  14. package/src/py/mcp-server/files/{Dockerfile.template → deploy/Dockerfile.template} +1 -1
  15. package/src/py/mcp-server/generator.js +8 -9
  16. package/src/py/mcp-server/generator.js.map +1 -1
  17. package/src/py/strands-agent/__snapshots__/generator.spec.ts.snap +23 -76
  18. package/src/py/strands-agent/files/{Dockerfile.template → deploy/Dockerfile.template} +1 -1
  19. package/src/py/strands-agent/generator.js +9 -9
  20. package/src/py/strands-agent/generator.js.map +1 -1
  21. package/src/smithy/ts/api/generator.js +1 -1
  22. package/src/smithy/ts/api/generator.js.map +1 -1
  23. package/src/trpc/backend/generator.js +1 -1
  24. package/src/trpc/backend/generator.js.map +1 -1
  25. package/src/ts/mcp-server/__snapshots__/generator.spec.ts.snap +30 -79
  26. package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap +3 -3
  27. package/src/utils/agent-core-constructs/agent-core-constructs.js +0 -3
  28. package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
  29. package/src/utils/agent-core-constructs/files/cdk/app/agent-core/__nameKebabCase__/__nameKebabCase__.ts.template +6 -2
  30. package/src/utils/agent-core-constructs/files/cdk/core/agent-core/runtime.ts.template +15 -72
  31. package/src/utils/api-constructs/api-constructs.d.ts +3 -3
  32. package/src/utils/api-constructs/files/cdk/app/apis/http/__apiNameKebabCase__.ts.template +2 -2
  33. package/src/utils/api-constructs/files/cdk/app/apis/rest/__apiNameKebabCase__.ts.template +2 -2
  34. package/src/utils/api-constructs/files/terraform/app/apis/http/__apiNameKebabCase__/__apiNameKebabCase__.tf.template +1 -1
  35. package/src/utils/api-constructs/files/terraform/app/apis/rest/__apiNameKebabCase__/__apiNameKebabCase__.tf.template +1 -1
  36. package/src/utils/bundle/bundle.d.ts +4 -1
  37. package/src/utils/bundle/bundle.js +18 -14
  38. package/src/utils/bundle/bundle.js.map +1 -1
  39. package/src/utils/versions.d.ts +6 -4
  40. package/src/utils/versions.js +5 -3
  41. package/src/utils/versions.js.map +1 -1
  42. /package/src/py/mcp-server/files/{__init__.py.template → app/__init__.py.template} +0 -0
  43. /package/src/py/mcp-server/files/{http.py.template → app/http.py.template} +0 -0
  44. /package/src/py/mcp-server/files/{server.py.template → app/server.py.template} +0 -0
  45. /package/src/py/mcp-server/files/{stdio.py.template → app/stdio.py.template} +0 -0
  46. /package/src/py/strands-agent/files/{__init__.py.template → app/__init__.py.template} +0 -0
  47. /package/src/py/strands-agent/files/{agent.py.template → app/agent.py.template} +0 -0
  48. /package/src/py/strands-agent/files/{agentcore_mcp_client.py.template → app/agentcore_mcp_client.py.template} +0 -0
  49. /package/src/py/strands-agent/files/{main.py.template → app/main.py.template} +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws/nx-plugin",
3
- "version": "0.50.0",
3
+ "version": "0.51.4",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/awslabs/nx-plugin-for-aws.git",
package/src/infra/app/__snapshots__/generator.spec.ts.snap CHANGED
@@ -2,8 +2,8 @@
2
2
 
3
3
  exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
4
4
  {
5
- "aws-cdk": "2.1027.0",
6
- "aws-cdk-lib": "2.213.0",
5
+ "aws-cdk": "2.1029.3",
6
+ "aws-cdk-lib": "2.217.0",
7
7
  "constructs": "10.4.2",
8
8
  "esbuild": "0.25.9",
9
9
  "source-map-support": "0.5.21",
@@ -42,8 +42,8 @@ exports[`infra generator > should add required dependencies to package.json > de
42
42
  exports[`infra generator > should add required dependencies to package.json > package-json 1`] = `
43
43
  {
44
44
  "dependencies": {
45
- "aws-cdk": "2.1027.0",
46
- "aws-cdk-lib": "2.213.0",
45
+ "aws-cdk": "2.1029.3",
46
+ "aws-cdk-lib": "2.217.0",
47
47
  "constructs": "10.4.2",
48
48
  "esbuild": "0.25.9",
49
49
  "source-map-support": "0.5.21",
package/src/license/config.js CHANGED
@@ -4,7 +4,7 @@ exports.readLicenseConfig = exports.writeLicenseConfig = exports.defaultLicenseC
4
4
  const tslib_1 = require("tslib");
5
5
  const utils_1 = require("../utils/config/utils");
6
6
  /**
7
- * Licenses containing a placeholder for the copyright year
7
+ * Licenses containing a placeholder for the copyright year.
8
8
  */
9
9
  const LICENSES_WITH_YEAR = new Set(['MIT']);
10
10
  /**
package/src/mcp-server/tools/create-workspace-command.js CHANGED
@@ -4,6 +4,7 @@ exports.addCreateWorkspaceCommandTool = void 0;
4
4
  const zod_v3_1 = require("zod-v3");
5
5
  const schema_1 = require("../schema");
6
6
  const iac_1 = require("../../utils/iac");
7
+ const versions_1 = require("../../utils/versions");
7
8
  /**
8
9
  * Add a tool which tells a model how to create an Nx workspace
9
10
  */
@@ -15,7 +16,7 @@ const addCreateWorkspaceCommandTool = (server) => {
15
16
  text: `Run the following command to create a workspace:
16
17
 
17
18
  \`\`\`bash
18
- npx create-nx-workspace@~21.4.1 ${workspaceName} --pm=${packageManager} --preset=@aws/nx-plugin --ci=skip
19
+ npx create-nx-workspace@${versions_1.TS_VERSIONS['create-nx-workspace']} ${workspaceName} --pm=${packageManager} --preset=@aws/nx-plugin --ci=skip
19
20
  \`\`\`
20
21
 
21
22
  This will create a new workspace within the ${workspaceName} directory.
package/src/mcp-server/tools/create-workspace-command.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"create-workspace-command.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/create-workspace-command.ts"],"names":[],"mappings":";;;AAKA,mCAA2B;AAC3B,sCAAiD;AACjD,yCAAgD;AAEhD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,IAAI,CACT,0BAA0B,EAC1B,oEAAoE,EACpE,EAAE,aAAa,EAAE,UAAC,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,6BAAoB,EAAE,EACnE,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;;;kCAGkB,aAAa,SAAS,cAAc;;;8CAGxB,aAAa;;qEAEU,mBAAa,CAAC,IAAI,CAAC,IAAI,CAAC;yCACpD,mBAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;GACzG;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,6BAA6B,iCAwBxC"}
1
+ {"version":3,"file":"create-workspace-command.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/create-workspace-command.ts"],"names":[],"mappings":";;;AAKA,mCAA2B;AAC3B,sCAAiD;AACjD,yCAAgD;AAChD,mDAAmD;AAEnD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,IAAI,CACT,0BAA0B,EAC1B,oEAAoE,EACpE,EAAE,aAAa,EAAE,UAAC,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,6BAAoB,EAAE,EACnE,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;;;0BAGU,sBAAW,CAAC,qBAAqB,CAAC,IAAI,aAAa,SAAS,cAAc;;;8CAGtD,aAAa;;qEAEU,mBAAa,CAAC,IAAI,CAAC,IAAI,CAAC;yCACpD,mBAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;GACzG;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,6BAA6B,iCAwBxC"}
package/src/py/fast-api/__snapshots__/generator.spec.ts.snap CHANGED
@@ -371,7 +371,7 @@ export class TestApi<
371
371
  code: Code.fromAsset(
372
372
  url.fileURLToPath(
373
373
  new URL(
374
- '../../../../../../dist/apps/nested/path/test_api/bundle',
374
+ '../../../../../../dist/apps/nested/path/test_api/bundle-x86',
375
375
  import.meta.url,
376
376
  ),
377
377
  ),
@@ -871,7 +871,7 @@ export class TestApi<
871
871
  code: Code.fromAsset(
872
872
  url.fileURLToPath(
873
873
  new URL(
874
- '../../../../../../dist/apps/nested/path/test_api/bundle',
874
+ '../../../../../../dist/apps/nested/path/test_api/bundle-x86',
875
875
  import.meta.url,
876
876
  ),
877
877
  ),
@@ -1520,7 +1520,7 @@ data "aws_caller_identity" "current" {}
1520
1520
  # Create Lambda ZIP file from the bundle directory
1521
1521
  data "archive_file" "lambda_zip" {
1522
1522
  type = "zip"
1523
- source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle"
1523
+ source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle-x86"
1524
1524
  output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/apis/test-api/lambda.zip"
1525
1525
  }
1526
1526
 
@@ -2140,7 +2140,7 @@ data "aws_caller_identity" "current" {}
2140
2140
  # Create Lambda ZIP file from the bundle directory
2141
2141
  data "archive_file" "lambda_zip" {
2142
2142
  type = "zip"
2143
- source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle"
2143
+ source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle-x86"
2144
2144
  output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/apis/test-api/lambda.zip"
2145
2145
  }
2146
2146
 
@@ -2747,7 +2747,7 @@ data "aws_caller_identity" "current" {}
2747
2747
  # Create Lambda ZIP file from the bundle directory
2748
2748
  data "archive_file" "lambda_zip" {
2749
2749
  type = "zip"
2750
- source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle"
2750
+ source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle-x86"
2751
2751
  output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/apis/test-api/lambda.zip"
2752
2752
  }
2753
2753
 
@@ -3249,7 +3249,7 @@ data "aws_caller_identity" "current" {}
3249
3249
  # Create Lambda ZIP file from the FastAPI bundle directory
3250
3250
  data "archive_file" "lambda_zip" {
3251
3251
  type = "zip"
3252
- source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle"
3252
+ source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle-x86"
3253
3253
  output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/apis/test-api/lambda.zip"
3254
3254
  }
3255
3255
 
@@ -3875,7 +3875,7 @@ data "aws_caller_identity" "current" {}
3875
3875
  # Create Lambda ZIP file from the FastAPI bundle directory
3876
3876
  data "archive_file" "lambda_zip" {
3877
3877
  type = "zip"
3878
- source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle"
3878
+ source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle-x86"
3879
3879
  output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/apis/test-api/lambda.zip"
3880
3880
  }
3881
3881
 
@@ -4503,7 +4503,7 @@ data "aws_caller_identity" "current" {}
4503
4503
  # Create Lambda ZIP file from the FastAPI bundle directory
4504
4504
  data "archive_file" "lambda_zip" {
4505
4505
  type = "zip"
4506
- source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle"
4506
+ source_dir = "\${path.module}/../../../../../../../dist/apps/test_api/bundle-x86"
4507
4507
  output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/apis/test-api/lambda.zip"
4508
4508
  }
4509
4509
 
package/src/py/fast-api/generator.js CHANGED
@@ -49,7 +49,7 @@ const pyFastApiProjectGenerator = (tree, schema) => tslib_1.__awaiter(void 0, vo
49
49
  });
50
50
  const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
51
51
  const port = (0, port_1.assignPort)(tree, projectConfig, 8000);
52
- (0, bundle_1.addPythonBundleTarget)(projectConfig);
52
+ const { bundleOutputDir } = (0, bundle_1.addPythonBundleTarget)(projectConfig);
53
53
  projectConfig.targets.serve = {
54
54
  executor: '@nxlv/python:run-commands',
55
55
  options: {
@@ -85,8 +85,8 @@ const pyFastApiProjectGenerator = (tree, schema) => tslib_1.__awaiter(void 0, vo
85
85
  constructType: schema.computeType === 'ServerlessApiGatewayHttpApi' ? 'http' : 'rest',
86
86
  backend: {
87
87
  type: 'fastapi',
88
- dir,
89
88
  moduleName: normalizedModuleName,
89
+ bundleOutputDir,
90
90
  },
91
91
  auth: schema.auth,
92
92
  iacProvider,
package/src/py/fast-api/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"names":[],"mappings":"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"}
package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap CHANGED
@@ -49,7 +49,7 @@ export class TestProjectTestFunction extends Function {
49
49
  code: Code.fromAsset(
50
50
  url.fileURLToPath(
51
51
  new URL(
52
- '../../../../../../dist/apps/test_project/bundle',
52
+ '../../../../../../dist/apps/test_project/bundle-x86',
53
53
  import.meta.url,
54
54
  ),
55
55
  ),
@@ -165,7 +165,7 @@ resource "aws_iam_role_policy_attachment" "lambda_policy_attachment" {
165
165
 
166
166
  data "archive_file" "lambda_zip" {
167
167
  type = "zip"
168
- source_dir = "\${path.module}/../../../../../../../dist/apps/test_project/bundle"
168
+ source_dir = "\${path.module}/../../../../../../../dist/apps/test_project/bundle-x86"
169
169
  output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/lambda-functions/test-project-test-function/lambda.zip"
170
170
  }
171
171
 
@@ -320,7 +320,7 @@ resource "aws_iam_role_policy_attachment" "lambda_policy_attachment" {
320
320
 
321
321
  data "archive_file" "lambda_zip" {
322
322
  type = "zip"
323
- source_dir = "\${path.module}/../../../../../../../dist/apps/test_project/bundle"
323
+ source_dir = "\${path.module}/../../../../../../../dist/apps/test_project/bundle-x86"
324
324
  output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/lambda-functions/test-project-snapshot-function/lambda.zip"
325
325
  }
326
326
 
package/src/py/lambda-function/generator.js CHANGED
@@ -70,19 +70,19 @@ const pyLambdaFunctionGenerator = (tree, schema) => tslib_1.__awaiter(void 0, vo
70
70
  yield (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
71
71
  iacProvider,
72
72
  });
73
+ // Check if the project has a bundle target and if not add it
74
+ const { bundleOutputDir } = (0, bundle_1.addPythonBundleTarget)(projectConfig);
73
75
  (0, function_constructs_1.addLambdaFunctionInfra)(tree, {
74
76
  functionProjectName: projectConfig.name,
75
77
  functionNameClassName: constructFunctionClassName,
76
78
  functionNameKebabCase: constructFunctionKebabCase,
77
79
  handler: normalizedFunctionPath,
78
- bundlePathFromRoot: `dist/${dir}/bundle`,
80
+ bundlePathFromRoot: bundleOutputDir,
79
81
  runtime: 'python',
80
82
  iacProvider,
81
83
  });
82
84
  const enhancedOptions = Object.assign(Object.assign({}, schema), { dir,
83
85
  lambdaFunctionClassName, lambdaFunctionSnakeCase: normalizedFunctionName });
84
- // Check if the project has a bundle target and if not add it
85
- (0, bundle_1.addPythonBundleTarget)(projectConfig);
86
86
  projectConfig.targets = (0, object_1.sortObjectKeys)(projectConfig.targets);
87
87
  (0, devkit_1.updateProjectConfiguration)(tree, projectConfig.name, projectConfig);
88
88
  // Generate the lambda handler file
package/src/py/lambda-function/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/lambda-function/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/lambda-function/generator.ts"],"names":[],"mappings":"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"}
package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap CHANGED
@@ -11,15 +11,9 @@ exports[`py#mcp-server generator > should match snapshot for BedrockAgentCoreRun
11
11
  Grant,
12
12
  IPrincipal,
13
13
  } from 'aws-cdk-lib/aws-iam';
14
- import {
15
- AwsCustomResource,
16
- AwsCustomResourcePolicy,
17
- PhysicalResourceId,
18
- PhysicalResourceIdReference,
19
- } from 'aws-cdk-lib/custom-resources';
20
14
  import { Construct } from 'constructs';
21
- import type { AuthorizerConfiguration } from '@aws-sdk/client-bedrock-agentcore-control';
22
15
  import { Stack } from 'aws-cdk-lib';
16
+ import { CfnRuntime } from 'aws-cdk-lib/aws-bedrockagentcore';
23
17
 
24
18
  /**
25
19
  * Options for the AgentCoreRuntime construct
@@ -30,7 +24,7 @@ export interface AgentCoreRuntimeProps {
30
24
  containerUri: string;
31
25
  serverProtocol: 'MCP' | 'HTTP';
32
26
  environment?: Record<string, string>;
33
- authorizerConfiguration?: AuthorizerConfiguration;
27
+ authorizerConfiguration?: CfnRuntime.AuthorizerConfigurationProperty;
34
28
  }
35
29
 
36
30
  /**
@@ -135,75 +129,24 @@ export class AgentCoreRuntime extends Construct implements IGrantable {
135
129
  });
136
130
  this.grantPrincipal = this.role.grantPrincipal;
137
131
 
138
- const agentRuntime = new AwsCustomResource(this, 'MCPSeverRuntime', {
139
- onCreate: {
140
- service: 'bedrock-agentcore-control',
141
- action: 'CreateAgentRuntime',
142
- parameters: {
143
- agentRuntimeName: props.runtimeName,
144
- agentRuntimeArtifact: {
145
- containerConfiguration: {
146
- containerUri: props.containerUri,
147
- },
148
- },
149
- description: props.description,
150
- environmentVariables: props.environment,
151
- networkConfiguration: {
152
- networkMode: 'PUBLIC',
153
- },
154
- protocolConfiguration: {
155
- serverProtocol: props.serverProtocol,
156
- },
157
- roleArn: this.role.roleArn,
158
- authorizerConfiguration: props.authorizerConfiguration,
159
- },
160
- physicalResourceId: PhysicalResourceId.fromResponse('agentRuntimeId'),
161
- },
162
- onUpdate: {
163
- service: 'bedrock-agentcore-control',
164
- action: 'UpdateAgentRuntime',
165
- parameters: {
166
- agentRuntimeId: new PhysicalResourceIdReference(),
167
- agentRuntimeName: props.runtimeName,
168
- agentRuntimeArtifact: {
169
- containerConfiguration: {
170
- containerUri: props.containerUri,
171
- },
172
- },
173
- description: props.description,
174
- environmentVariables: props.environment,
175
- networkConfiguration: {
176
- networkMode: 'PUBLIC',
177
- },
178
- protocolConfiguration: {
179
- serverProtocol: props.serverProtocol,
180
- },
181
- roleArn: this.role.roleArn,
182
- authorizerConfiguration: props.authorizerConfiguration,
132
+ const agentRuntime = new CfnRuntime(this, 'MCPServerRuntime', {
133
+ agentRuntimeName: props.runtimeName,
134
+ agentRuntimeArtifact: {
135
+ containerConfiguration: {
136
+ containerUri: props.containerUri,
183
137
  },
184
- physicalResourceId: PhysicalResourceId.fromResponse('agentRuntimeId'),
185
138
  },
186
- onDelete: {
187
- service: 'bedrock-agentcore-control',
188
- action: 'DeleteAgentRuntime',
189
- parameters: {
190
- agentRuntimeId: new PhysicalResourceIdReference(),
191
- },
139
+ description: props.description,
140
+ environmentVariables: props.environment,
141
+ networkConfiguration: {
142
+ networkMode: 'PUBLIC',
192
143
  },
193
- policy: AwsCustomResourcePolicy.fromStatements([
194
- new PolicyStatement({
195
- actions: ['bedrock-agentcore:*'],
196
- resources: ['*'],
197
- }),
198
- new PolicyStatement({
199
- actions: ['iam:PassRole'],
200
- resources: [this.role.roleArn],
201
- }),
202
- ]),
203
- installLatestAwsSdk: true,
144
+ protocolConfiguration: props.serverProtocol,
145
+ roleArn: this.role.roleArn,
146
+ authorizerConfiguration: props.authorizerConfiguration,
204
147
  });
205
148
 
206
- this.arn = agentRuntime.getResponseField('agentRuntimeArn');
149
+ this.arn = agentRuntime.attrAgentRuntimeArn;
207
150
  }
208
151
 
209
152
  /**
@@ -233,7 +176,8 @@ export * from './runtime-config.js';
233
176
  `;
234
177
 
235
178
  exports[`py#mcp-server generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > mcp-server-construct.ts 1`] = `
236
- "import { DockerImageAsset, Platform } from 'aws-cdk-lib/aws-ecr-assets';
179
+ "import { Lazy, Names } from 'aws-cdk-lib';
180
+ import { DockerImageAsset, Platform } from 'aws-cdk-lib/aws-ecr-assets';
237
181
  import { Construct } from 'constructs';
238
182
  import { execSync } from 'child_process';
239
183
  import * as path from 'path';
@@ -268,12 +212,19 @@ export class SnapshotBedrockServer extends Construct {
268
212
  ).trim(),
269
213
  });
270
214
 
271
- this.agentCoreRuntime = new AgentCoreRuntime(this, 'AgentCore', {
272
- runtimeName: 'SnapshotBedrockServer',
273
- serverProtocol: 'MCP',
274
- containerUri: this.dockerImage.imageUri,
275
- ...props,
276
- });
215
+ this.agentCoreRuntime = new AgentCoreRuntime(
216
+ this,
217
+ 'SnapshotBedrockServer',
218
+ {
219
+ runtimeName: Lazy.string({
220
+ produce: () =>
221
+ Names.uniqueResourceName(this.agentCoreRuntime, { maxLength: 40 }),
222
+ }),
223
+ serverProtocol: 'MCP',
224
+ containerUri: this.dockerImage.imageUri,
225
+ ...props,
226
+ },
227
+ );
277
228
  }
278
229
  }
279
230
  "
package/src/py/mcp-server/files/{Dockerfile.template → deploy/Dockerfile.template} RENAMED
@@ -3,7 +3,7 @@ FROM public.ecr.aws/docker/library/python:3.12-slim
3
3
  WORKDIR /app
4
4
 
5
5
  # Copy bundled package
6
- COPY --from=workspace <%- distDir %>/bundle /app
6
+ COPY --from=workspace <%- bundleOutputDir %> /app
7
7
 
8
8
  EXPOSE 8000
9
9
 
package/src/py/mcp-server/generator.js CHANGED
@@ -39,15 +39,13 @@ const pyMcpServerGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0
39
39
  const mcpServerNameSnakeCase = (0, names_1.toSnakeCase)((_b = options.name) !== null && _b !== void 0 ? _b : 'mcp-server');
40
40
  const mcpServerNameClassName = (0, names_1.toClassName)(name);
41
41
  const targetSourceDir = (0, devkit_1.joinPathFragments)(project.sourceRoot, mcpServerNameSnakeCase);
42
- const distDir = (0, devkit_1.joinPathFragments)('dist', project.root);
43
42
  const computeType = (_c = options.computeType) !== null && _c !== void 0 ? _c : 'BedrockAgentCoreRuntime';
44
43
  // Generate example server
45
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), targetSourceDir, {
44
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), targetSourceDir, {
46
45
  name,
47
46
  mcpServerNameSnakeCase,
48
47
  mcpServerNameClassName,
49
48
  moduleName,
50
- distDir,
51
49
  }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
52
50
  (0, py_1.addDependenciesToPyProjectToml)(tree, project.root, [
53
51
  'mcp',
@@ -57,9 +55,14 @@ const pyMcpServerGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0
57
55
  if (computeType === 'BedrockAgentCoreRuntime') {
58
56
  const dockerImageTag = `${(0, npm_scope_1.getNpmScope)(tree)}-${name}:latest`;
59
57
  // Add bundle target
60
- (0, bundle_1.addPythonBundleTarget)(project, {
58
+ const { bundleTargetName, bundleOutputDir } = (0, bundle_1.addPythonBundleTarget)(project, {
61
59
  pythonPlatform: 'aarch64-manylinux2014',
62
60
  });
61
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'deploy'), targetSourceDir, {
62
+ mcpServerNameSnakeCase,
63
+ moduleName,
64
+ bundleOutputDir,
65
+ }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
63
66
  const dockerTargetName = `${name}-docker`;
64
67
  // Add a docker target specific to this MCP server
65
68
  project.targets[dockerTargetName] = {
@@ -71,7 +74,7 @@ const pyMcpServerGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0
71
74
  ],
72
75
  parallel: false,
73
76
  },
74
- dependsOn: ['bundle'],
77
+ dependsOn: [bundleTargetName],
75
78
  };
76
79
  project.targets.docker = Object.assign(Object.assign({}, project.targets.docker), { dependsOn: [
77
80
  ...((_e = (_d = project.targets.docker) === null || _d === void 0 ? void 0 : _d.dependsOn) !== null && _e !== void 0 ? _e : []).filter((t) => t !== dockerTargetName),
@@ -93,10 +96,6 @@ const pyMcpServerGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0
93
96
  iacProvider,
94
97
  });
95
98
  }
96
- else {
97
- // No Dockerfile needed for non-hosted MCP
98
- tree.delete((0, devkit_1.joinPathFragments)(targetSourceDir, 'Dockerfile'));
99
- }
100
99
  (0, devkit_1.updateProjectConfiguration)(tree, project.name, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), {
101
100
  // Add targets for running the MCP server
102
101
  [`${options.name ? name : 'mcp-server'}-serve-stdio`]: {
package/src/py/mcp-server/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/mcp-server/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/mcp-server/generator.ts"],"names":[],"mappings":"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"}
package/src/py/strands-agent/__snapshots__/generator.spec.ts.snap CHANGED
@@ -6,7 +6,7 @@ exports[`py#strands-agent generator > should match snapshot for BedrockAgentCore
6
6
  WORKDIR /app
7
7
 
8
8
  # Copy bundled package
9
- COPY --from=workspace dist/apps/test-project/bundle /app
9
+ COPY --from=workspace dist/apps/test-project/bundle-arm /app
10
10
 
11
11
  EXPOSE 8080
12
12
 
@@ -19,7 +19,8 @@ CMD ["python", "bin/opentelemetry-instrument", "python", "-m", "proj_test_projec
19
19
  `;
20
20
 
21
21
  exports[`py#strands-agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > agent-construct.ts 1`] = `
22
- "import { DockerImageAsset, Platform } from 'aws-cdk-lib/aws-ecr-assets';
22
+ "import { Lazy, Names } from 'aws-cdk-lib';
23
+ import { DockerImageAsset, Platform } from 'aws-cdk-lib/aws-ecr-assets';
23
24
  import { Construct } from 'constructs';
24
25
  import { execSync } from 'child_process';
25
26
  import * as path from 'path';
@@ -50,8 +51,11 @@ export class SnapshotBedrockAgent extends Construct {
50
51
  ).trim(),
51
52
  });
52
53
 
53
- this.agentCoreRuntime = new AgentCoreRuntime(this, 'AgentCore', {
54
- runtimeName: 'SnapshotBedrockAgent',
54
+ this.agentCoreRuntime = new AgentCoreRuntime(this, 'SnapshotBedrockAgent', {
55
+ runtimeName: Lazy.string({
56
+ produce: () =>
57
+ Names.uniqueResourceName(this.agentCoreRuntime, { maxLength: 40 }),
58
+ }),
55
59
  serverProtocol: 'HTTP',
56
60
  containerUri: this.dockerImage.imageUri,
57
61
  ...props,
@@ -72,15 +76,9 @@ exports[`py#strands-agent generator > should match snapshot for BedrockAgentCore
72
76
  Grant,
73
77
  IPrincipal,
74
78
  } from 'aws-cdk-lib/aws-iam';
75
- import {
76
- AwsCustomResource,
77
- AwsCustomResourcePolicy,
78
- PhysicalResourceId,
79
- PhysicalResourceIdReference,
80
- } from 'aws-cdk-lib/custom-resources';
81
79
  import { Construct } from 'constructs';
82
- import type { AuthorizerConfiguration } from '@aws-sdk/client-bedrock-agentcore-control';
83
80
  import { Stack } from 'aws-cdk-lib';
81
+ import { CfnRuntime } from 'aws-cdk-lib/aws-bedrockagentcore';
84
82
 
85
83
  /**
86
84
  * Options for the AgentCoreRuntime construct
@@ -91,7 +89,7 @@ export interface AgentCoreRuntimeProps {
91
89
  containerUri: string;
92
90
  serverProtocol: 'MCP' | 'HTTP';
93
91
  environment?: Record<string, string>;
94
- authorizerConfiguration?: AuthorizerConfiguration;
92
+ authorizerConfiguration?: CfnRuntime.AuthorizerConfigurationProperty;
95
93
  }
96
94
 
97
95
  /**
@@ -196,75 +194,24 @@ export class AgentCoreRuntime extends Construct implements IGrantable {
196
194
  });
197
195
  this.grantPrincipal = this.role.grantPrincipal;
198
196
 
199
- const agentRuntime = new AwsCustomResource(this, 'MCPSeverRuntime', {
200
- onCreate: {
201
- service: 'bedrock-agentcore-control',
202
- action: 'CreateAgentRuntime',
203
- parameters: {
204
- agentRuntimeName: props.runtimeName,
205
- agentRuntimeArtifact: {
206
- containerConfiguration: {
207
- containerUri: props.containerUri,
208
- },
209
- },
210
- description: props.description,
211
- environmentVariables: props.environment,
212
- networkConfiguration: {
213
- networkMode: 'PUBLIC',
214
- },
215
- protocolConfiguration: {
216
- serverProtocol: props.serverProtocol,
217
- },
218
- roleArn: this.role.roleArn,
219
- authorizerConfiguration: props.authorizerConfiguration,
220
- },
221
- physicalResourceId: PhysicalResourceId.fromResponse('agentRuntimeId'),
222
- },
223
- onUpdate: {
224
- service: 'bedrock-agentcore-control',
225
- action: 'UpdateAgentRuntime',
226
- parameters: {
227
- agentRuntimeId: new PhysicalResourceIdReference(),
228
- agentRuntimeName: props.runtimeName,
229
- agentRuntimeArtifact: {
230
- containerConfiguration: {
231
- containerUri: props.containerUri,
232
- },
233
- },
234
- description: props.description,
235
- environmentVariables: props.environment,
236
- networkConfiguration: {
237
- networkMode: 'PUBLIC',
238
- },
239
- protocolConfiguration: {
240
- serverProtocol: props.serverProtocol,
241
- },
242
- roleArn: this.role.roleArn,
243
- authorizerConfiguration: props.authorizerConfiguration,
197
+ const agentRuntime = new CfnRuntime(this, 'MCPServerRuntime', {
198
+ agentRuntimeName: props.runtimeName,
199
+ agentRuntimeArtifact: {
200
+ containerConfiguration: {
201
+ containerUri: props.containerUri,
244
202
  },
245
- physicalResourceId: PhysicalResourceId.fromResponse('agentRuntimeId'),
246
203
  },
247
- onDelete: {
248
- service: 'bedrock-agentcore-control',
249
- action: 'DeleteAgentRuntime',
250
- parameters: {
251
- agentRuntimeId: new PhysicalResourceIdReference(),
252
- },
204
+ description: props.description,
205
+ environmentVariables: props.environment,
206
+ networkConfiguration: {
207
+ networkMode: 'PUBLIC',
253
208
  },
254
- policy: AwsCustomResourcePolicy.fromStatements([
255
- new PolicyStatement({
256
- actions: ['bedrock-agentcore:*'],
257
- resources: ['*'],
258
- }),
259
- new PolicyStatement({
260
- actions: ['iam:PassRole'],
261
- resources: [this.role.roleArn],
262
- }),
263
- ]),
264
- installLatestAwsSdk: true,
209
+ protocolConfiguration: props.serverProtocol,
210
+ roleArn: this.role.roleArn,
211
+ authorizerConfiguration: props.authorizerConfiguration,
265
212
  });
266
213
 
267
- this.arn = agentRuntime.getResponseField('agentRuntimeArn');
214
+ this.arn = agentRuntime.attrAgentRuntimeArn;
268
215
  }
269
216
 
270
217
  /**
package/src/py/strands-agent/files/{Dockerfile.template → deploy/Dockerfile.template} RENAMED
@@ -3,7 +3,7 @@ FROM public.ecr.aws/docker/library/python:3.12-slim
3
3
  WORKDIR /app
4
4
 
5
5
  # Copy bundled package
6
- COPY --from=workspace <%- distDir %>/bundle /app
6
+ COPY --from=workspace <%- bundleOutputDir %> /app
7
7
 
8
8
  EXPOSE 8080
9
9