@aws/nx-plugin 0.109.1 → 0.111.0
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.
- package/package.json +1 -1
- package/src/connection/agent-serve-local.js +7 -8
- package/src/connection/agent-serve-local.js.map +1 -1
- package/src/connection/serve-local.js +7 -8
- package/src/connection/serve-local.js.map +1 -1
- package/src/infra/app/generator.js +2 -5
- package/src/infra/app/generator.js.map +1 -1
- package/src/preset/__snapshots__/generator.spec.ts.snap +11 -1
- package/src/preset/generator.js +12 -3
- package/src/preset/generator.js.map +1 -1
- package/src/py/fast-api/__snapshots__/generator.spec.ts.snap +19 -19
- package/src/py/fast-api/files/app/__name__/init.py.template +2 -2
- package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap +2 -2
- package/src/py/project/generator.js +17 -1
- package/src/py/project/generator.js.map +1 -1
- package/src/py/strands-agent/__snapshots__/generator.spec.ts.snap +1 -1
- package/src/py/strands-agent/a2a-connection/generator.js +4 -8
- package/src/py/strands-agent/a2a-connection/generator.js.map +1 -1
- package/src/py/strands-agent/files/http/init.py.template +2 -2
- package/src/py/strands-agent/mcp-connection/__snapshots__/generator.spec.ts.snap +8 -4
- package/src/py/strands-agent/mcp-connection/generator.js +4 -8
- package/src/py/strands-agent/mcp-connection/generator.js.map +1 -1
- package/src/smithy/ts/api/__snapshots__/generator.spec.ts.snap +1 -1
- package/src/trpc/backend/__snapshots__/generator.spec.ts.snap +8 -8
- package/src/ts/lambda-function/__snapshots__/generator.spec.ts.snap +2 -2
- package/src/ts/react-website/agui/generator.js +7 -0
- package/src/ts/react-website/agui/generator.js.map +1 -1
- package/src/ts/strands-agent/a2a-connection/generator.js +4 -8
- package/src/ts/strands-agent/a2a-connection/generator.js.map +1 -1
- package/src/ts/strands-agent/mcp-connection/generator.js +4 -8
- package/src/ts/strands-agent/mcp-connection/generator.js.map +1 -1
- package/src/utils/agent-connection/files/py-core-mcp/agentcore_mcp_client.py.template +9 -3
- package/src/utils/agent-connection/files/py-core-runtime-config/runtime_config.py.template +3 -2
- package/src/utils/api-constructs/api-constructs.js +2 -10
- package/src/utils/api-constructs/api-constructs.js.map +1 -1
- package/src/utils/api-constructs/files/terraform/app/apis/http/__apiNameKebabCase__/__apiNameKebabCase__.tf.template +2 -2
- package/src/utils/api-constructs/files/terraform/app/apis/rest/__apiNameKebabCase__/__apiNameKebabCase__.tf.template +3 -3
- package/src/utils/api-constructs/files/terraform/core/api/http/http-api/http-api.tf.template +2 -2
- package/src/utils/api-constructs/open-api-metadata.js +2 -7
- package/src/utils/api-constructs/open-api-metadata.js.map +1 -1
- package/src/utils/files/terraform/src/core/asset-bucket/asset-bucket.tf.template +2 -2
- package/src/utils/function-constructs/files/terraform/app/lambda-functions/__functionNameKebabCase__/__functionNameKebabCase__.tf.template +1 -1
- package/src/utils/function-constructs/function-constructs.js +2 -10
- package/src/utils/function-constructs/function-constructs.js.map +1 -1
- package/src/utils/identity-constructs/files/terraform/core/user-identity/identity/identity.tf.template +6 -6
- package/src/utils/nx.d.ts +14 -1
- package/src/utils/nx.js +27 -1
- package/src/utils/nx.js.map +1 -1
- package/src/utils/pnpm-workspace.d.ts +22 -0
- package/src/utils/pnpm-workspace.js +58 -0
- package/src/utils/pnpm-workspace.js.map +1 -0
- package/src/utils/versions.d.ts +3 -2
- package/src/utils/versions.js +3 -2
- package/src/utils/versions.js.map +1 -1
- package/src/utils/website-constructs/website-constructs.js +2 -10
- package/src/utils/website-constructs/website-constructs.js.map +1 -1
package/package.json
CHANGED
|
@@ -30,14 +30,13 @@ const addAgentTargetToServeLocal = async (tree, sourceProjectName, targetProject
|
|
|
30
30
|
}
|
|
31
31
|
// Add a dependency on the agent serve-local target (so that the agent's
|
|
32
32
|
// own serve-local dependencies, such as MCP servers, are also started)
|
|
33
|
-
sourceProject
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
];
|
|
33
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, 'serve-local', {
|
|
34
|
+
projects: [targetProject.name],
|
|
35
|
+
target: agentServeLocalTargetName,
|
|
36
|
+
});
|
|
37
|
+
for (const additional of options.additionalDependencyTargets ?? []) {
|
|
38
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, 'serve-local', additional);
|
|
39
|
+
}
|
|
41
40
|
(0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
|
|
42
41
|
// Add an override to runtime-config for the serve-local target to use the local url
|
|
43
42
|
const runtimeConfigProvider = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src', 'components', 'RuntimeConfig', 'index.tsx');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-serve-local.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/connection/agent-serve-local.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAIoB;AACpB,sCAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"agent-serve-local.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/connection/agent-serve-local.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAIoB;AACpB,sCAA2C;AAC3C,oCAIqB;AAqBrB;;;;;;;GAOG;AACI,MAAM,0BAA0B,GAAG,KAAK,EAC7C,IAAU,EACV,iBAAyB,EACzB,iBAAyB,EACzB,OAA+B,EAC/B,EAAE;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IAEF,gEAAgE;IAChE,MAAM,yBAAyB,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI;QAC7D,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,cAAc;QAC/C,CAAC,CAAC,mBAAmB,CAAC;IAExB,4EAA4E;IAC5E,IACE,CAAC,CACC,aAAa,CAAC,OAAO,EAAE,CAAC,yBAAyB,CAAC,EAAE,UAAU;QAC9D,aAAa,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,CACvC,EACD,CAAC;QACD,OAAO;IACT,CAAC;IAED,wEAAwE;IACxE,uEAAuE;IACvE,IAAA,sCAAiC,EAAC,aAAa,EAAE,aAAa,EAAE;QAC9D,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;QAC9B,MAAM,EAAE,yBAAyB;KAClC,CAAC,CAAC;IACH,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,2BAA2B,IAAI,EAAE,EAAE,CAAC;QACnE,IAAA,sCAAiC,EAAC,aAAa,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC;IACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEpE,oFAAoF;IACpF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,aAAa,CAAC,IAAI,EAClB,KAAK,EACL,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACvC,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,qBAAqB,EACrB,iFAAiF,OAAO,CAAC,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,OAAO,OAAO,CAAC,QAAQ,yGAAyG,CAC9Q,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAxDW,QAAA,0BAA0B,8BAwDrC"}
|
|
@@ -22,14 +22,13 @@ const addTargetToServeLocal = async (tree, sourceProjectName, targetProjectName,
|
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
24
|
// Add a dependency on the serve-local target
|
|
25
|
-
sourceProject
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
];
|
|
25
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, 'serve-local', {
|
|
26
|
+
projects: [targetProject.name],
|
|
27
|
+
target: 'serve-local',
|
|
28
|
+
});
|
|
29
|
+
for (const additional of options.additionalDependencyTargets ?? []) {
|
|
30
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, 'serve-local', additional);
|
|
31
|
+
}
|
|
33
32
|
(0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
|
|
34
33
|
// Add an override to runtime-config.json for the serve-local target to use the local url
|
|
35
34
|
const runtimeConfigProvider = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src', 'components', 'RuntimeConfig', 'index.tsx');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-local.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/connection/serve-local.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAIoB;AACpB,sCAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"serve-local.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/connection/serve-local.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAIoB;AACpB,sCAA2C;AAC3C,oCAGqB;AACrB,0CAA6C;AAQ7C;;;GAGG;AACI,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAU,EACV,iBAAyB,EACzB,iBAAyB,EACzB,OAA0B,EAC1B,EAAE;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IAEF,oEAAoE;IACpE,IACE,CAAC,CACC,aAAa,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,UAAU;QAClD,aAAa,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,CACvC,EACD,CAAC;QACD,OAAO;IACT,CAAC;IAED,6CAA6C;IAC7C,IAAA,sCAAiC,EAAC,aAAa,EAAE,aAAa,EAAE;QAC9D,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;QAC9B,MAAM,EAAE,aAAa;KACtB,CAAC,CAAC;IACH,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,2BAA2B,IAAI,EAAE,EAAE,CAAC;QACnE,IAAA,sCAAiC,EAAC,aAAa,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC;IACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEpE,yFAAyF;IACzF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,aAAa,CAAC,IAAI,EAClB,KAAK,EACL,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,qBAAqB,EACrB,sFAAsF,SAAS,OAAO,OAAO,CAAC,GAAG,sJAAsJ,SAAS,MAAM,CACvR,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAnDW,QAAA,qBAAqB,yBAmDhC"}
|
|
@@ -70,11 +70,8 @@ async function tsInfraGenerator(tree, schema) {
|
|
|
70
70
|
});
|
|
71
71
|
(0, devkit_1.updateJson)(tree, `${libraryRoot}/project.json`, (config) => {
|
|
72
72
|
config.projectType = 'application';
|
|
73
|
-
config
|
|
74
|
-
|
|
75
|
-
'synth',
|
|
76
|
-
'checkov',
|
|
77
|
-
];
|
|
73
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(config, 'build', 'synth');
|
|
74
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(config, 'build', 'checkov');
|
|
78
75
|
config.targets.compile.outputs = [
|
|
79
76
|
'{workspaceRoot}/dist/{projectRoot}/tsc',
|
|
80
77
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -219,7 +219,17 @@ exports[`preset generator > should run successfully > packages/.gitkeep 1`] = `"
|
|
|
219
219
|
|
|
220
220
|
exports[`preset generator > should run successfully > pnpm-workspace.yaml 1`] = `
|
|
221
221
|
"packages:
|
|
222
|
-
-
|
|
222
|
+
- packages/*
|
|
223
|
+
allowBuilds:
|
|
224
|
+
'@swc/core': true
|
|
225
|
+
esbuild: true
|
|
226
|
+
nx: true
|
|
227
|
+
sharp: true
|
|
228
|
+
onlyBuiltDependencies:
|
|
229
|
+
- '@swc/core'
|
|
230
|
+
- esbuild
|
|
231
|
+
- nx
|
|
232
|
+
- sharp
|
|
223
233
|
"
|
|
224
234
|
`;
|
|
225
235
|
|
package/src/preset/generator.js
CHANGED
|
@@ -20,14 +20,23 @@ const child_process_1 = require("child_process");
|
|
|
20
20
|
const enquirer = tslib_1.__importStar(require("enquirer"));
|
|
21
21
|
const utils_1 = require("../utils/config/utils");
|
|
22
22
|
const generator_1 = require("../ts/sync/generator");
|
|
23
|
+
const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
|
|
23
24
|
const WORKSPACES = ['packages/*'];
|
|
24
25
|
const NX_TYPESCRIPT_SYNC_GENERATOR = '@nx/js:typescript-sync';
|
|
26
|
+
// Built dependencies whose install scripts the generated workspace trusts.
|
|
27
|
+
// `onlyBuiltDependencies` is the pnpm 10 key (silently ignored by pnpm 11);
|
|
28
|
+
// pnpm 11 reads `allowBuilds` instead. Any dep NOT in this allowlist will
|
|
29
|
+
// have its install scripts skipped with a warning — matching pnpm 10's
|
|
30
|
+
// default behaviour. The user can opt-in later via `pnpm approve-builds`.
|
|
31
|
+
const PNPM_BUILT_DEPENDENCIES = ['@swc/core', 'esbuild', 'nx', 'sharp'];
|
|
25
32
|
exports.PRESET_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
26
33
|
const setUpWorkspaces = (tree) => {
|
|
27
34
|
if ((0, devkit_1.detectPackageManager)() === 'pnpm') {
|
|
28
|
-
tree.write('pnpm-workspace.yaml',
|
|
29
|
-
|
|
30
|
-
|
|
35
|
+
tree.write('pnpm-workspace.yaml', js_yaml_1.default.dump({
|
|
36
|
+
packages: WORKSPACES,
|
|
37
|
+
allowBuilds: Object.fromEntries(PNPM_BUILT_DEPENDENCIES.map((dep) => [dep, true])),
|
|
38
|
+
onlyBuiltDependencies: PNPM_BUILT_DEPENDENCIES,
|
|
39
|
+
}, { quotingType: "'" }));
|
|
31
40
|
}
|
|
32
41
|
else {
|
|
33
42
|
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/preset/generator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/preset/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -189,7 +189,7 @@ class LoggerRouteHandler(APIRoute):
|
|
|
189
189
|
app.router.route_class = LoggerRouteHandler
|
|
190
190
|
|
|
191
191
|
|
|
192
|
-
def custom_openapi():
|
|
192
|
+
def custom_openapi() -> dict[str, Any]:
|
|
193
193
|
if app.openapi_schema:
|
|
194
194
|
return app.openapi_schema
|
|
195
195
|
for route in app.routes:
|
|
@@ -206,7 +206,7 @@ def custom_openapi():
|
|
|
206
206
|
return app.openapi_schema
|
|
207
207
|
|
|
208
208
|
|
|
209
|
-
app.openapi = custom_openapi
|
|
209
|
+
app.openapi = custom_openapi # ty: ignore[invalid-assignment]
|
|
210
210
|
",
|
|
211
211
|
"apps/test_api/proj_test_api/main.py": "import uvicorn
|
|
212
212
|
from pydantic import BaseModel
|
|
@@ -2030,7 +2030,7 @@ resource "aws_kms_key" "logs_key" {
|
|
|
2030
2030
|
Sid = "Allow CloudWatch Logs"
|
|
2031
2031
|
Effect = "Allow"
|
|
2032
2032
|
Principal = {
|
|
2033
|
-
Service = "logs.\${data.aws_region.current.
|
|
2033
|
+
Service = "logs.\${data.aws_region.current.region}.amazonaws.com"
|
|
2034
2034
|
}
|
|
2035
2035
|
Action = [
|
|
2036
2036
|
"kms:Encrypt",
|
|
@@ -2042,7 +2042,7 @@ resource "aws_kms_key" "logs_key" {
|
|
|
2042
2042
|
Resource = "*"
|
|
2043
2043
|
Condition = {
|
|
2044
2044
|
ArnEquals = {
|
|
2045
|
-
"kms:EncryptionContext:aws:logs:arn" = "arn:aws:logs:\${data.aws_region.current.
|
|
2045
|
+
"kms:EncryptionContext:aws:logs:arn" = "arn:aws:logs:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:log-group:/aws/apigateway/\${var.api_name}"
|
|
2046
2046
|
}
|
|
2047
2047
|
}
|
|
2048
2048
|
}
|
|
@@ -2318,7 +2318,7 @@ resource "aws_lambda_function" "api_lambda" {
|
|
|
2318
2318
|
role = aws_iam_role.lambda_execution_role.arn
|
|
2319
2319
|
handler = "run.sh"
|
|
2320
2320
|
runtime = "python3.14"
|
|
2321
|
-
layers = ["arn:aws:lambda:\${data.aws_region.current.
|
|
2321
|
+
layers = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
|
|
2322
2322
|
timeout = 30
|
|
2323
2323
|
memory_size = 128
|
|
2324
2324
|
publish = true
|
|
@@ -2417,7 +2417,7 @@ resource "aws_apigatewayv2_authorizer" "cognito_authorizer" {
|
|
|
2417
2417
|
|
|
2418
2418
|
jwt_configuration {
|
|
2419
2419
|
audience = var.user_pool_client_ids
|
|
2420
|
-
issuer = "https://cognito-idp.\${data.aws_region.current.
|
|
2420
|
+
issuer = "https://cognito-idp.\${data.aws_region.current.region}.amazonaws.com/\${var.user_pool_id}"
|
|
2421
2421
|
}
|
|
2422
2422
|
}
|
|
2423
2423
|
|
|
@@ -2701,7 +2701,7 @@ resource "aws_kms_key" "logs_key" {
|
|
|
2701
2701
|
Sid = "Allow CloudWatch Logs"
|
|
2702
2702
|
Effect = "Allow"
|
|
2703
2703
|
Principal = {
|
|
2704
|
-
Service = "logs.\${data.aws_region.current.
|
|
2704
|
+
Service = "logs.\${data.aws_region.current.region}.amazonaws.com"
|
|
2705
2705
|
}
|
|
2706
2706
|
Action = [
|
|
2707
2707
|
"kms:Encrypt",
|
|
@@ -2713,7 +2713,7 @@ resource "aws_kms_key" "logs_key" {
|
|
|
2713
2713
|
Resource = "*"
|
|
2714
2714
|
Condition = {
|
|
2715
2715
|
ArnEquals = {
|
|
2716
|
-
"kms:EncryptionContext:aws:logs:arn" = "arn:aws:logs:\${data.aws_region.current.
|
|
2716
|
+
"kms:EncryptionContext:aws:logs:arn" = "arn:aws:logs:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:log-group:/aws/apigateway/\${var.api_name}"
|
|
2717
2717
|
}
|
|
2718
2718
|
}
|
|
2719
2719
|
}
|
|
@@ -2979,7 +2979,7 @@ resource "aws_lambda_function" "api_lambda" {
|
|
|
2979
2979
|
role = aws_iam_role.lambda_execution_role.arn
|
|
2980
2980
|
handler = "run.sh"
|
|
2981
2981
|
runtime = "python3.14"
|
|
2982
|
-
layers = ["arn:aws:lambda:\${data.aws_region.current.
|
|
2982
|
+
layers = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
|
|
2983
2983
|
timeout = 30
|
|
2984
2984
|
memory_size = 128
|
|
2985
2985
|
publish = true
|
|
@@ -3349,7 +3349,7 @@ resource "aws_kms_key" "logs_key" {
|
|
|
3349
3349
|
Sid = "Allow CloudWatch Logs"
|
|
3350
3350
|
Effect = "Allow"
|
|
3351
3351
|
Principal = {
|
|
3352
|
-
Service = "logs.\${data.aws_region.current.
|
|
3352
|
+
Service = "logs.\${data.aws_region.current.region}.amazonaws.com"
|
|
3353
3353
|
}
|
|
3354
3354
|
Action = [
|
|
3355
3355
|
"kms:Encrypt",
|
|
@@ -3361,7 +3361,7 @@ resource "aws_kms_key" "logs_key" {
|
|
|
3361
3361
|
Resource = "*"
|
|
3362
3362
|
Condition = {
|
|
3363
3363
|
ArnEquals = {
|
|
3364
|
-
"kms:EncryptionContext:aws:logs:arn" = "arn:aws:logs:\${data.aws_region.current.
|
|
3364
|
+
"kms:EncryptionContext:aws:logs:arn" = "arn:aws:logs:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:log-group:/aws/apigateway/\${var.api_name}"
|
|
3365
3365
|
}
|
|
3366
3366
|
}
|
|
3367
3367
|
}
|
|
@@ -3627,7 +3627,7 @@ resource "aws_lambda_function" "api_lambda" {
|
|
|
3627
3627
|
role = aws_iam_role.lambda_execution_role.arn
|
|
3628
3628
|
handler = "run.sh"
|
|
3629
3629
|
runtime = "python3.14"
|
|
3630
|
-
layers = ["arn:aws:lambda:\${data.aws_region.current.
|
|
3630
|
+
layers = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
|
|
3631
3631
|
timeout = 30
|
|
3632
3632
|
memory_size = 128
|
|
3633
3633
|
publish = true
|
|
@@ -4299,7 +4299,7 @@ resource "aws_lambda_function" "api_lambda" {
|
|
|
4299
4299
|
role = aws_iam_role.lambda_execution_role.arn
|
|
4300
4300
|
handler = "run.sh"
|
|
4301
4301
|
runtime = "python3.14"
|
|
4302
|
-
layers = ["arn:aws:lambda:\${data.aws_region.current.
|
|
4302
|
+
layers = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
|
|
4303
4303
|
timeout = 30
|
|
4304
4304
|
memory_size = 128
|
|
4305
4305
|
publish = true
|
|
@@ -4394,7 +4394,7 @@ resource "aws_api_gateway_authorizer" "cognito_authorizer" {
|
|
|
4394
4394
|
name = "TestApiAuthorizer-\${random_string.suffix.result}"
|
|
4395
4395
|
rest_api_id = module.rest_api.api_id
|
|
4396
4396
|
type = "COGNITO_USER_POOLS"
|
|
4397
|
-
provider_arns = ["arn:aws:cognito-idp:\${data.aws_region.current.
|
|
4397
|
+
provider_arns = ["arn:aws:cognito-idp:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:userpool/\${var.user_pool_id}"]
|
|
4398
4398
|
identity_source = "method.request.header.Authorization"
|
|
4399
4399
|
}
|
|
4400
4400
|
|
|
@@ -4414,7 +4414,7 @@ resource "aws_api_gateway_integration" "lambda_integration" {
|
|
|
4414
4414
|
integration_http_method = "POST"
|
|
4415
4415
|
type = "AWS_PROXY"
|
|
4416
4416
|
# Use the response streaming invocation path with the alias ARN for SnapStart
|
|
4417
|
-
uri = "arn:aws:apigateway:\${data.aws_region.current.
|
|
4417
|
+
uri = "arn:aws:apigateway:\${data.aws_region.current.region}:lambda:path/2021-11-15/functions/\${aws_lambda_alias.live.arn}/response-streaming-invocations"
|
|
4418
4418
|
response_transfer_mode = "STREAM"
|
|
4419
4419
|
|
|
4420
4420
|
depends_on = [aws_lambda_alias.live]
|
|
@@ -5115,7 +5115,7 @@ resource "aws_lambda_function" "api_lambda" {
|
|
|
5115
5115
|
role = aws_iam_role.lambda_execution_role.arn
|
|
5116
5116
|
handler = "run.sh"
|
|
5117
5117
|
runtime = "python3.14"
|
|
5118
|
-
layers = ["arn:aws:lambda:\${data.aws_region.current.
|
|
5118
|
+
layers = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
|
|
5119
5119
|
timeout = 30
|
|
5120
5120
|
memory_size = 128
|
|
5121
5121
|
publish = true
|
|
@@ -5222,7 +5222,7 @@ resource "aws_api_gateway_integration" "lambda_integration" {
|
|
|
5222
5222
|
integration_http_method = "POST"
|
|
5223
5223
|
type = "AWS_PROXY"
|
|
5224
5224
|
# Use the response streaming invocation path with the alias ARN for SnapStart
|
|
5225
|
-
uri = "arn:aws:apigateway:\${data.aws_region.current.
|
|
5225
|
+
uri = "arn:aws:apigateway:\${data.aws_region.current.region}:lambda:path/2021-11-15/functions/\${aws_lambda_alias.live.arn}/response-streaming-invocations"
|
|
5226
5226
|
response_transfer_mode = "STREAM"
|
|
5227
5227
|
|
|
5228
5228
|
depends_on = [aws_lambda_alias.live]
|
|
@@ -5933,7 +5933,7 @@ resource "aws_lambda_function" "api_lambda" {
|
|
|
5933
5933
|
role = aws_iam_role.lambda_execution_role.arn
|
|
5934
5934
|
handler = "run.sh"
|
|
5935
5935
|
runtime = "python3.14"
|
|
5936
|
-
layers = ["arn:aws:lambda:\${data.aws_region.current.
|
|
5936
|
+
layers = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
|
|
5937
5937
|
timeout = 30
|
|
5938
5938
|
memory_size = 128
|
|
5939
5939
|
publish = true
|
|
@@ -6040,7 +6040,7 @@ resource "aws_api_gateway_integration" "lambda_integration" {
|
|
|
6040
6040
|
integration_http_method = "POST"
|
|
6041
6041
|
type = "AWS_PROXY"
|
|
6042
6042
|
# Use the response streaming invocation path with the alias ARN for SnapStart
|
|
6043
|
-
uri = "arn:aws:apigateway:\${data.aws_region.current.
|
|
6043
|
+
uri = "arn:aws:apigateway:\${data.aws_region.current.region}:lambda:path/2021-11-15/functions/\${aws_lambda_alias.live.arn}/response-streaming-invocations"
|
|
6044
6044
|
response_transfer_mode = "STREAM"
|
|
6045
6045
|
|
|
6046
6046
|
depends_on = [aws_lambda_alias.live]
|
|
@@ -176,7 +176,7 @@ class LoggerRouteHandler(APIRoute):
|
|
|
176
176
|
app.router.route_class = LoggerRouteHandler
|
|
177
177
|
|
|
178
178
|
|
|
179
|
-
def custom_openapi():
|
|
179
|
+
def custom_openapi() -> dict[str, Any]:
|
|
180
180
|
if app.openapi_schema:
|
|
181
181
|
return app.openapi_schema
|
|
182
182
|
for route in app.routes:
|
|
@@ -193,4 +193,4 @@ def custom_openapi():
|
|
|
193
193
|
return app.openapi_schema
|
|
194
194
|
|
|
195
195
|
|
|
196
|
-
app.openapi = custom_openapi
|
|
196
|
+
app.openapi = custom_openapi # ty: ignore[invalid-assignment]
|
|
@@ -111,7 +111,7 @@ data "aws_region" "current" {}
|
|
|
111
111
|
|
|
112
112
|
locals {
|
|
113
113
|
aws_account_id = data.aws_caller_identity.current.account_id
|
|
114
|
-
aws_region = data.aws_region.current.
|
|
114
|
+
aws_region = data.aws_region.current.region
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
resource "random_string" "suffix" {
|
|
@@ -292,7 +292,7 @@ data "aws_region" "current" {}
|
|
|
292
292
|
|
|
293
293
|
locals {
|
|
294
294
|
aws_account_id = data.aws_caller_identity.current.account_id
|
|
295
|
-
aws_region = data.aws_region.current.
|
|
295
|
+
aws_region = data.aws_region.current.region
|
|
296
296
|
}
|
|
297
297
|
|
|
298
298
|
resource "random_string" "suffix" {
|
|
@@ -15,6 +15,7 @@ const git_1 = require("../../utils/git");
|
|
|
15
15
|
const nx_1 = require("../../utils/nx");
|
|
16
16
|
const metrics_1 = require("../../utils/metrics");
|
|
17
17
|
const toml_1 = require("../../utils/toml");
|
|
18
|
+
const py_1 = require("../../utils/py");
|
|
18
19
|
exports.PY_PROJECT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
19
20
|
/**
|
|
20
21
|
* Returns details about the Python project to be created
|
|
@@ -103,8 +104,22 @@ const pyProjectGenerator = async (tree, schema) => {
|
|
|
103
104
|
outputPath: buildOutputPath,
|
|
104
105
|
},
|
|
105
106
|
};
|
|
107
|
+
projectConfiguration.targets.typecheck = {
|
|
108
|
+
cache: true,
|
|
109
|
+
executor: '@nxlv/python:run-commands',
|
|
110
|
+
options: {
|
|
111
|
+
command: 'uv run ty check',
|
|
112
|
+
cwd: '{projectRoot}',
|
|
113
|
+
},
|
|
114
|
+
};
|
|
106
115
|
projectConfiguration.targets.build = {
|
|
107
|
-
dependsOn: [
|
|
116
|
+
dependsOn: [
|
|
117
|
+
'lint',
|
|
118
|
+
'compile',
|
|
119
|
+
'test',
|
|
120
|
+
'typecheck',
|
|
121
|
+
...(buildTarget.dependsOn ?? []),
|
|
122
|
+
],
|
|
108
123
|
options: {
|
|
109
124
|
outputPath,
|
|
110
125
|
},
|
|
@@ -116,6 +131,7 @@ const pyProjectGenerator = async (tree, schema) => {
|
|
|
116
131
|
}
|
|
117
132
|
return pyProjectToml;
|
|
118
133
|
});
|
|
134
|
+
(0, py_1.addDependenciesToDependencyGroupInPyProjectToml)(tree, '.', 'dev', ['ty']);
|
|
119
135
|
// Add a dependency on the format target for lint in order to reduce the number of
|
|
120
136
|
// fixable lint errors (eg line too long)
|
|
121
137
|
projectConfiguration.targets.lint = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/project/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAWoB;AAEpB,yDAKiC;AACjC,mDAAoD;AACpD,qDAAoD;AACpD,6CAAgD;AAChD,+CAAoD;AACpD,yCAAkD;AAClD,uCAIwB;AACxB,iDAAsE;AACtE,2CAA8C;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/project/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,14 +82,10 @@ const pyStrandsAgentA2aConnectionGenerator = async (tree, options) => {
|
|
|
82
82
|
const serveLocalTargetName = `${agentName}-serve-local`;
|
|
83
83
|
const targetServeLocalTargetName = `${targetAgentComponentName}-serve-local`;
|
|
84
84
|
if (sourceProject.targets?.[serveLocalTargetName]) {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
projects: [targetProject.name],
|
|
90
|
-
target: targetServeLocalTargetName,
|
|
91
|
-
},
|
|
92
|
-
];
|
|
85
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, serveLocalTargetName, {
|
|
86
|
+
projects: [targetProject.name],
|
|
87
|
+
target: targetServeLocalTargetName,
|
|
88
|
+
});
|
|
93
89
|
(0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
|
|
94
90
|
}
|
|
95
91
|
await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/strands-agent/a2a-connection/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAQoB;AAEpB,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/strands-agent/a2a-connection/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,7 +79,7 @@ async def unhandled_exception_handler(request, err):
|
|
|
79
79
|
)
|
|
80
80
|
|
|
81
81
|
|
|
82
|
-
def custom_openapi():
|
|
82
|
+
def custom_openapi() -> dict[str, Any]:
|
|
83
83
|
if app.openapi_schema:
|
|
84
84
|
return app.openapi_schema
|
|
85
85
|
for route in app.routes:
|
|
@@ -96,4 +96,4 @@ def custom_openapi():
|
|
|
96
96
|
return app.openapi_schema
|
|
97
97
|
|
|
98
98
|
|
|
99
|
-
app.openapi = custom_openapi
|
|
99
|
+
app.openapi = custom_openapi # ty: ignore[invalid-assignment]
|
|
@@ -10,7 +10,9 @@ __all__ = ["InventoryMcpClient"]
|
|
|
10
10
|
`;
|
|
11
11
|
|
|
12
12
|
exports[`py#strands-agent#mcp-connection generator > should match snapshot for generated files > agentcore_mcp_client.py 1`] = `
|
|
13
|
-
"import
|
|
13
|
+
"from collections.abc import Callable
|
|
14
|
+
|
|
15
|
+
import boto3
|
|
14
16
|
import httpx
|
|
15
17
|
from mcp.client.streamable_http import streamablehttp_client
|
|
16
18
|
from strands.tools.mcp.mcp_client import MCPClient
|
|
@@ -36,8 +38,8 @@ class AgentCoreMCPClient:
|
|
|
36
38
|
def _create(
|
|
37
39
|
agent_runtime_arn: str,
|
|
38
40
|
session_id: str,
|
|
39
|
-
headers: dict = None,
|
|
40
|
-
auth_handler: httpx.Auth = None,
|
|
41
|
+
headers: dict | None = None,
|
|
42
|
+
auth_handler: httpx.Auth | None = None,
|
|
41
43
|
) -> MCPClient:
|
|
42
44
|
_, url = AgentCoreMCPClient._build_url(agent_runtime_arn)
|
|
43
45
|
return MCPClient(
|
|
@@ -71,7 +73,9 @@ class AgentCoreMCPClient:
|
|
|
71
73
|
|
|
72
74
|
@staticmethod
|
|
73
75
|
def with_jwt_auth(
|
|
74
|
-
agent_runtime_arn: str,
|
|
76
|
+
agent_runtime_arn: str,
|
|
77
|
+
access_token_provider: Callable[[], str],
|
|
78
|
+
session_id: str,
|
|
75
79
|
) -> MCPClient:
|
|
76
80
|
"""Create an MCP client with JWT authentication.
|
|
77
81
|
|
|
@@ -79,14 +79,10 @@ const pyStrandsAgentMcpConnectionGenerator = async (tree, options) => {
|
|
|
79
79
|
const serveLocalTargetName = `${agentName}-serve-local`;
|
|
80
80
|
const mcpServeLocalTargetName = `${mcpComponentName}-serve-local`;
|
|
81
81
|
if (sourceProject.targets?.[serveLocalTargetName]) {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
projects: [targetProject.name],
|
|
87
|
-
target: mcpServeLocalTargetName,
|
|
88
|
-
},
|
|
89
|
-
];
|
|
82
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, serveLocalTargetName, {
|
|
83
|
+
projects: [targetProject.name],
|
|
84
|
+
target: mcpServeLocalTargetName,
|
|
85
|
+
});
|
|
90
86
|
(0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
|
|
91
87
|
}
|
|
92
88
|
await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/strands-agent/mcp-connection/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAQoB;AAEpB,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/strands-agent/mcp-connection/generator.ts"],"names":[],"mappings":"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"}
|