@aws/nx-plugin 0.119.0 → 0.121.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/mcp-server/generator-info.d.ts +2 -6
- package/src/mcp-server/generator-info.js +19 -40
- package/src/mcp-server/generator-info.js.map +1 -1
- package/src/preset/generator.js +1 -0
- package/src/preset/generator.js.map +1 -1
- package/src/py/agent/generator.js +4 -1
- package/src/py/agent/generator.js.map +1 -1
- package/src/py/agent/schema.json +1 -1
- package/src/py/fast-api/__snapshots__/generator.spec.ts.snap +197 -12
- package/src/py/fast-api/generator.js +9 -0
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/schema.d.ts +1 -1
- package/src/py/fast-api/schema.json +2 -2
- package/src/py/mcp-server/generator.js +3 -0
- package/src/py/mcp-server/generator.js.map +1 -1
- package/src/py/mcp-server/schema.json +1 -1
- package/src/smithy/ts/api/__snapshots__/generator.spec.ts.snap +195 -11
- package/src/smithy/ts/api/generator.js +18 -0
- package/src/smithy/ts/api/generator.js.map +1 -1
- package/src/smithy/ts/api/schema.d.ts +1 -1
- package/src/smithy/ts/api/schema.json +2 -2
- package/src/trpc/backend/__snapshots__/generator.spec.ts.snap +258 -25
- package/src/trpc/backend/generator.js +19 -0
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/backend/schema.d.ts +1 -1
- package/src/trpc/backend/schema.json +2 -2
- package/src/trpc/react/__snapshots__/generator.spec.ts.snap +28 -18
- package/src/trpc/react/files/src/components/__apiNameClassName__ClientProvider.tsx.template +9 -6
- package/src/trpc/react/generator.js +2 -6
- package/src/trpc/react/generator.js.map +1 -1
- package/src/ts/agent/generator.js +4 -1
- package/src/ts/agent/generator.js.map +1 -1
- package/src/ts/agent/schema.json +1 -1
- package/src/ts/mcp-server/generator.js +3 -0
- package/src/ts/mcp-server/generator.js.map +1 -1
- package/src/ts/mcp-server/schema.json +1 -1
- package/src/utils/api-constructs/api-constructs.d.ts +3 -1
- package/src/utils/api-constructs/api-constructs.js.map +1 -1
- package/src/utils/api-constructs/files/cdk/app/apis/http/__apiNameKebabCase__.ts.template +38 -6
- package/src/utils/api-constructs/files/cdk/app/apis/rest/__apiNameKebabCase__.ts.template +39 -3
- package/src/utils/api-constructs/files/cdk/authorizer/http/authorizer.ts.template +34 -0
- package/src/utils/api-constructs/files/cdk/authorizer/rest/authorizer.ts.template +52 -0
- package/src/utils/api-constructs/files/py-authorizer/http/authorizer.py.template +25 -0
- package/src/utils/api-constructs/files/py-authorizer/rest/authorizer.py.template +39 -0
- package/src/utils/api-constructs/files/terraform/app/apis/http/__apiNameKebabCase__/__apiNameKebabCase__.tf.template +112 -5
- package/src/utils/api-constructs/files/terraform/app/apis/rest/__apiNameKebabCase__/__apiNameKebabCase__.tf.template +114 -6
- package/src/utils/commands.d.ts +1 -1
- package/src/utils/commands.js +3 -2
- package/src/utils/commands.js.map +1 -1
- package/src/utils/connection/open-api/react.d.ts +1 -1
|
@@ -5,9 +5,7 @@ import { createContext, FC, PropsWithChildren, useMemo } from "react";
|
|
|
5
5
|
import { useRuntimeConfig } from "../hooks/useRuntimeConfig";
|
|
6
6
|
<%_ if (isRestApi) { _%>
|
|
7
7
|
import { TRPCClient, createTRPCClient, httpLink, httpSubscriptionLink, splitLink } from "@trpc/client";
|
|
8
|
-
<%_ if (auth !== 'None') { _%>
|
|
9
8
|
import { EventSourcePolyfill } from "event-source-polyfill";
|
|
10
|
-
<%_ } _%>
|
|
11
9
|
<%_ } else { _%>
|
|
12
10
|
import { HTTPLinkOptions, TRPCClient, createTRPCClient, httpLink } from "@trpc/client";
|
|
13
11
|
<%_ } _%>
|
|
@@ -45,7 +43,6 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
|
|
|
45
43
|
condition: (op) => op.type === 'subscription',
|
|
46
44
|
true: httpSubscriptionLink({
|
|
47
45
|
url: apiUrl,
|
|
48
|
-
<%_ if (auth !== 'None') { _%>
|
|
49
46
|
EventSource: EventSourcePolyfill,
|
|
50
47
|
eventSourceOptions: async ({ op }) => {
|
|
51
48
|
<%_ if (auth === 'IAM') { _%>
|
|
@@ -66,11 +63,11 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
|
|
|
66
63
|
Authorization: `Bearer ${user?.id_token}`,
|
|
67
64
|
},
|
|
68
65
|
};
|
|
69
|
-
<%_ } else { _%>
|
|
70
|
-
|
|
66
|
+
<%_ } else if (auth === 'Custom') { _%>
|
|
67
|
+
// TODO: Add headers required by your custom authorizer
|
|
68
|
+
return { headers: {} };
|
|
71
69
|
<%_ } _%>
|
|
72
70
|
},
|
|
73
|
-
<%_ } _%>
|
|
74
71
|
}),
|
|
75
72
|
false: httpLink({
|
|
76
73
|
url: apiUrl,
|
|
@@ -80,6 +77,9 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
|
|
|
80
77
|
headers: {
|
|
81
78
|
Authorization: `Bearer ${user?.id_token}`,
|
|
82
79
|
},
|
|
80
|
+
<%_ } else if (auth === 'Custom') { _%>
|
|
81
|
+
// TODO: Add headers required by your custom authorizer
|
|
82
|
+
headers: {},
|
|
83
83
|
<%_ } _%>
|
|
84
84
|
}),
|
|
85
85
|
}),
|
|
@@ -94,6 +94,9 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
|
|
|
94
94
|
headers: {
|
|
95
95
|
Authorization: `Bearer ${user?.id_token}`,
|
|
96
96
|
},
|
|
97
|
+
<%_ } else if (auth === 'Custom') { _%>
|
|
98
|
+
// TODO: Add headers required by your custom authorizer
|
|
99
|
+
headers: {},
|
|
97
100
|
<%_ } _%>
|
|
98
101
|
};
|
|
99
102
|
|
|
@@ -68,9 +68,7 @@ async function reactGenerator(tree, options) {
|
|
|
68
68
|
'@trpc/tanstack-react-query',
|
|
69
69
|
'@tanstack/react-query',
|
|
70
70
|
'@tanstack/react-query-devtools',
|
|
71
|
-
...(isRestApi
|
|
72
|
-
? ['event-source-polyfill']
|
|
73
|
-
: []),
|
|
71
|
+
...(isRestApi ? ['event-source-polyfill'] : []),
|
|
74
72
|
...(auth === 'IAM'
|
|
75
73
|
? [
|
|
76
74
|
'oidc-client-ts',
|
|
@@ -82,9 +80,7 @@ async function reactGenerator(tree, options) {
|
|
|
82
80
|
...(auth === 'Cognito' ? ['react-oidc-context'] : []),
|
|
83
81
|
]), (0, versions_1.withVersions)([
|
|
84
82
|
'@smithy/types',
|
|
85
|
-
...(isRestApi
|
|
86
|
-
? ['@types/event-source-polyfill']
|
|
87
|
-
: []),
|
|
83
|
+
...(isRestApi ? ['@types/event-source-polyfill'] : []),
|
|
88
84
|
]));
|
|
89
85
|
await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TRPC_REACT_GENERATOR_INFO]);
|
|
90
86
|
await (0, format_1.formatFilesInSubtree)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":";;;AA8BA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,8 +35,11 @@ const tsAgentGenerator = async (tree, options) => {
|
|
|
35
35
|
const relativeSourceDir = targetSourceDir.replace(project.root + '/', './');
|
|
36
36
|
const distDir = (0, devkit_1.joinPathFragments)('dist', project.root);
|
|
37
37
|
const computeType = options.computeType ?? 'BedrockAgentCoreRuntime';
|
|
38
|
-
const auth = options.auth ?? 'IAM';
|
|
39
38
|
const protocol = options.protocol ?? 'HTTP';
|
|
39
|
+
if (computeType === 'None' && options.auth && options.auth !== 'IAM') {
|
|
40
|
+
console.warn('Warning: auth is ignored when no compute type is configured (no infrastructure is generated)');
|
|
41
|
+
}
|
|
42
|
+
const auth = options.auth ?? 'IAM';
|
|
40
43
|
// Ensure the shared agent-connection project exists so the server entry
|
|
41
44
|
// point can import `runWithSessionId` and propagate the AgentCore session
|
|
42
45
|
// ID to any downstream MCP / A2A clients a later connection generator
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/agent/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCASoB;AAEpB,uCAMwB;AACxB,iDAAsE;AACtE,+CAA0D;AAC1D,6CAA2D;AAC3D,mDAAiE;AACjE,qDAAoD;AACpD,sDAAsE;AACtE,yCAAqD;AACrD,uDAAgE;AAChE,qEAA0E;AAC1E,mGAAwF;AAExF,2CAA8C;AAC9C,uCAA4C;AAC5C,oFAAuG;AAE1F,QAAA,uBAAuB,GAClC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,gBAAgB,GAAG,KAAK,EACnC,IAAU,EACV,OAA+B,EACH,EAAE;IAC9B,MAAM,OAAO,GAAG,IAAA,wCAAmC,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CACb,uBAAuB,OAAO,CAAC,OAAO,wDAAwD,CAC/F,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC;IACxE,MAAM,IAAI,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,IAAI,WAAW,CAAC,CAAC;IACpD,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IACxD,MAAM,oCAAoC,GAAG,IAAA,0BAAiB,EAC5D,KAAK,EACL,iBAAiB,CAClB,CAAC;IACF,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,OAAO,CAAC,IAAI,EACZ,oCAAoC,CACrC,CAAC;IACF,MAAM,iBAAiB,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,yBAAyB,CAAC;IACrE,MAAM,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/agent/generator.ts"],"names":[],"mappings":"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"}
|
package/src/ts/agent/schema.json
CHANGED
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"auth": {
|
|
40
40
|
"type": "string",
|
|
41
|
-
"description": "The method used to authenticate with your Agent.
|
|
41
|
+
"description": "The method used to authenticate with your Agent. Only applicable when computeType is set (ignored when computeType is None).",
|
|
42
42
|
"default": "IAM",
|
|
43
43
|
"enum": ["IAM", "Cognito"],
|
|
44
44
|
"x-prompt": "How would you like to authenticate with your Agent?",
|
|
@@ -34,6 +34,9 @@ const tsMcpServerGenerator = async (tree, options) => {
|
|
|
34
34
|
const relativeSourceDir = targetSourceDir.replace(project.root + '/', './');
|
|
35
35
|
const distDir = (0, devkit_1.joinPathFragments)('dist', project.root);
|
|
36
36
|
const computeType = options.computeType ?? 'BedrockAgentCoreRuntime';
|
|
37
|
+
if (computeType === 'None' && options.auth && options.auth !== 'IAM') {
|
|
38
|
+
console.warn('Warning: auth is ignored when no compute type is configured (no infrastructure is generated)');
|
|
39
|
+
}
|
|
37
40
|
const auth = options.auth ?? 'IAM';
|
|
38
41
|
// Create a package.json if one doesn't exist, since we want to add the server as a bin target
|
|
39
42
|
const projectPackageJsonPath = (0, devkit_1.joinPathFragments)(project.root, 'package.json');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAaoB;AAEpB,uCAMwB;AACxB,iDAAsE;AACtE,+CAA0D;AAC1D,mDAAiE;AACjE,6CAA2D;AAC3D,qEAA0E;AAC1E,mGAA4F;AAE5F,qDAAoD;AACpD,yCAAqD;AACrD,uDAAgE;AAChE,sDAAsE;AACtE,2CAA8C;AAC9C,uCAA4C;AAE/B,QAAA,4BAA4B,GACvC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,oBAAoB,GAAG,KAAK,EACvC,IAAU,EACV,OAAmC,EACP,EAAE;IAC9B,MAAM,OAAO,GAAG,IAAA,wCAAmC,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CACb,uBAAuB,OAAO,CAAC,OAAO,wDAAwD,CAC/F,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,IAAI,WAAW,CAAC,CAAC;IACpD,MAAM,sBAAsB,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;IACjD,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;IAC3D,MAAM,oCAAoC,GAAG,IAAA,0BAAiB,EAC5D,KAAK,EACL,eAAe,CAChB,CAAC;IACF,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,OAAO,CAAC,IAAI,EACZ,oCAAoC,CACrC,CAAC;IACF,MAAM,iBAAiB,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
},
|
|
31
31
|
"auth": {
|
|
32
32
|
"type": "string",
|
|
33
|
-
"description": "The method used to authenticate with your MCP server.
|
|
33
|
+
"description": "The method used to authenticate with your MCP server. Only applicable when computeType is set (ignored when computeType is None).",
|
|
34
34
|
"default": "IAM",
|
|
35
35
|
"enum": ["IAM", "Cognito"],
|
|
36
36
|
"x-prompt": "How would you like to authenticate with your MCP server?",
|
|
@@ -12,6 +12,7 @@ export interface TrpcBackendOptions extends BackendOptions {
|
|
|
12
12
|
type: 'trpc';
|
|
13
13
|
projectAlias: string;
|
|
14
14
|
bundleOutputDir: string;
|
|
15
|
+
authorizerBundleOutputDir?: string;
|
|
15
16
|
}
|
|
16
17
|
export interface FastApiBackendOptions extends BackendOptions {
|
|
17
18
|
type: 'fastapi';
|
|
@@ -21,6 +22,7 @@ export interface FastApiBackendOptions extends BackendOptions {
|
|
|
21
22
|
export interface SmithyBackendOptions extends BackendOptions {
|
|
22
23
|
type: 'smithy';
|
|
23
24
|
bundleOutputDir: string;
|
|
25
|
+
authorizerBundleOutputDir?: string;
|
|
24
26
|
}
|
|
25
27
|
export interface AddApiGatewayConstructOptions {
|
|
26
28
|
apiProjectName: string;
|
|
@@ -28,7 +30,7 @@ export interface AddApiGatewayConstructOptions {
|
|
|
28
30
|
apiNameKebabCase: string;
|
|
29
31
|
constructType: 'http' | 'rest';
|
|
30
32
|
backend: TrpcBackendOptions | FastApiBackendOptions | SmithyBackendOptions;
|
|
31
|
-
auth: 'IAM' | 'Cognito' | '
|
|
33
|
+
auth: 'IAM' | 'Cognito' | 'Custom';
|
|
32
34
|
}
|
|
33
35
|
export declare const addApiGatewayInfra: (tree: Tree, options: AddApiGatewayConstructOptions & {
|
|
34
36
|
iacProvider: IacProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-constructs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/api-constructs/api-constructs.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAOoB;AACpB,gFAIwC;AACxC,gCAAuC;AAEvC,8BAA0D;
|
|
1
|
+
{"version":3,"file":"api-constructs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/api-constructs/api-constructs.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAOoB;AACpB,gFAIwC;AACxC,gCAAuC;AAEvC,8BAA0D;AAmCnD,MAAM,kBAAkB,GAAG,KAAK,EACrC,IAAU,EACV,OAAqE,EACrE,EAAE;IACF,IAAI,OAAO,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;QAClC,MAAM,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;SAAM,IAAI,OAAO,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;QAC/C,6BAA6B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EACf,0CAAY,EACZ,OAAO,CAAC,WAAW,KAAK,KAAK;QAC3B,CAAC,CAAC,mDAAqB;QACvB,CAAC,CAAC,kDAAoB,EACxB,cAAc,CACf,EACD,CAAC,MAA4B,EAAE,EAAE;QAC/B,IAAA,sCAAiC,EAC/B,MAAM,EACN,OAAO,EACP,GAAG,OAAO,CAAC,cAAc,QAAQ,CAClC,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,kBAAkB,sBA8B7B;AAEF;;GAEG;AACH,MAAM,0BAA0B,GAAG,KAAK,EACtC,IAAU,EACV,OAAsC,EACtC,EAAE;IACF,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,EAAE;QAC3C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,EACjE,IAAA,0BAAiB,EACf,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,MAAM,EACN,KAAK,CACN,EACD,EAAE,EACF;YACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;SAClD,CACF,CAAC;IACJ,CAAC,CAAC;IAEF,qDAAqD;IACrD,mBAAmB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3C,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC7B,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACpC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,sCAAsC;IACtC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,OAAO,EACP,KAAK,EACL,KAAK,EACL,MAAM,EACN,OAAO,CAAC,aAAa,CACtB,EACD,IAAA,0BAAiB,EACf,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,KAAK,EACL,MAAM,CACP,EACD,OAAO,EACP;QACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;KAClD,CACF,CAAC;IAEF,oCAAoC;IACpC,MAAM,IAAA,mBAAa,EACjB,IAAI,EACJ,IAAA,0BAAiB,EACf,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,KAAK,EACL,MAAM,EACN,UAAU,CACX,EACD,KAAK,OAAO,CAAC,gBAAgB,KAAK,CACnC,CAAC;IACF,MAAM,IAAA,mBAAa,EACjB,IAAI,EACJ,IAAA,0BAAiB,EACf,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,KAAK,EACL,UAAU,CACX,EACD,iBAAiB,CAClB,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,6BAA6B,GAAG,CACpC,IAAU,EACV,OAAsC,EACtC,EAAE;IACF,iCAAiC;IACjC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,OAAO,EACP,WAAW,EACX,MAAM,EACN,KAAK,EACL,OAAO,CAAC,aAAa,CACtB,EACD,IAAA,0BAAiB,EAAC,0CAAY,EAAE,kDAAoB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAC3E,EAAE,EACF;QACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;KAClD,CACF,CAAC;IAEF,yCAAyC;IACzC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,OAAO,EACP,WAAW,EACX,KAAK,EACL,MAAM,EACN,OAAO,CAAC,aAAa,CACtB,EACD,IAAA,0BAAiB,EAAC,0CAAY,EAAE,kDAAoB,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAC3E,OAAO,EACP;QACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;KAClD,CACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -17,16 +17,16 @@ import { RuntimeConfig } from '../../core/runtime-config.js';
|
|
|
17
17
|
import {
|
|
18
18
|
CorsHttpMethod,
|
|
19
19
|
CfnApi,
|
|
20
|
-
<%_ if (auth === 'None') { _%>
|
|
21
|
-
HttpNoneAuthorizer,
|
|
22
|
-
<%_ } _%>
|
|
23
20
|
} from 'aws-cdk-lib/aws-apigatewayv2';
|
|
24
|
-
<%_ if (['IAM', 'Cognito'].includes(auth)) { _%>
|
|
21
|
+
<%_ if (['IAM', 'Cognito', 'Custom'].includes(auth)) { _%>
|
|
25
22
|
import {
|
|
26
23
|
<%_ if (auth === 'IAM') { _%>
|
|
27
24
|
HttpIamAuthorizer,
|
|
28
25
|
<%_ } else if (auth === 'Cognito') { _%>
|
|
29
26
|
HttpUserPoolAuthorizer,
|
|
27
|
+
<%_ } else if (auth === 'Custom') { _%>
|
|
28
|
+
HttpLambdaAuthorizer,
|
|
29
|
+
HttpLambdaResponseType,
|
|
30
30
|
<%_ } _%>
|
|
31
31
|
} from 'aws-cdk-lib/aws-apigatewayv2-authorizers';
|
|
32
32
|
<%_ } _%>
|
|
@@ -175,6 +175,36 @@ export class <%= apiNameClassName %><
|
|
|
175
175
|
id: string,
|
|
176
176
|
props: <%= apiNameClassName %>Props<TIntegrations>,
|
|
177
177
|
) {
|
|
178
|
+
<%_ if (auth === 'Custom') { _%>
|
|
179
|
+
const authorizerFunction = new Function(scope, '<%= apiNameClassName %>AuthorizerFunction', {
|
|
180
|
+
<%_ if (['trpc', 'smithy'].includes(backend.type)) { _%>
|
|
181
|
+
runtime: Runtime.NODEJS_LATEST,
|
|
182
|
+
handler: 'index.handler',
|
|
183
|
+
code: Code.fromAsset(
|
|
184
|
+
url.fileURLToPath(
|
|
185
|
+
new URL(
|
|
186
|
+
'../../../../../../<%- backend.authorizerBundleOutputDir %>',
|
|
187
|
+
import.meta.url,
|
|
188
|
+
),
|
|
189
|
+
),
|
|
190
|
+
),
|
|
191
|
+
<%_ } else if (backend.type === 'fastapi') { _%>
|
|
192
|
+
runtime: Runtime.PYTHON_3_14,
|
|
193
|
+
handler: '<%- backend.moduleName %>.authorizer.handler',
|
|
194
|
+
code: Code.fromAsset(
|
|
195
|
+
url.fileURLToPath(
|
|
196
|
+
new URL(
|
|
197
|
+
'../../../../../../<%- backend.bundleOutputDir %>',
|
|
198
|
+
import.meta.url,
|
|
199
|
+
),
|
|
200
|
+
),
|
|
201
|
+
),
|
|
202
|
+
<%_ } _%>
|
|
203
|
+
timeout: Duration.seconds(10),
|
|
204
|
+
tracing: Tracing.ACTIVE,
|
|
205
|
+
});
|
|
206
|
+
<%_ } _%>
|
|
207
|
+
|
|
178
208
|
super(scope, id, {
|
|
179
209
|
apiName: '<%= apiNameClassName %>',
|
|
180
210
|
corsPreflight: {
|
|
@@ -194,8 +224,10 @@ export class <%= apiNameClassName %><
|
|
|
194
224
|
defaultAuthorizer: new HttpUserPoolAuthorizer('<%= apiNameClassName %>Authorizer', props.identity.userPool, {
|
|
195
225
|
userPoolClients: [props.identity.userPoolClient]
|
|
196
226
|
}),
|
|
197
|
-
<%_ } else if (auth === '
|
|
198
|
-
defaultAuthorizer: new
|
|
227
|
+
<%_ } else if (auth === 'Custom') { _%>
|
|
228
|
+
defaultAuthorizer: new HttpLambdaAuthorizer('<%= apiNameClassName %>LambdaAuthorizer', authorizerFunction, {
|
|
229
|
+
responseTypes: [HttpLambdaResponseType.SIMPLE],
|
|
230
|
+
}),
|
|
199
231
|
<%_ } _%>
|
|
200
232
|
<%_ if (backend.type === 'trpc') { _%>
|
|
201
233
|
operations: routerToOperations(appRouter),
|
|
@@ -22,6 +22,9 @@ import {
|
|
|
22
22
|
<%_ if (auth === 'Cognito') { _%>
|
|
23
23
|
CognitoUserPoolsAuthorizer,
|
|
24
24
|
<%_ } _%>
|
|
25
|
+
<%_ if (auth === 'Custom') { _%>
|
|
26
|
+
TokenAuthorizer,
|
|
27
|
+
<%_ } _%>
|
|
25
28
|
} from 'aws-cdk-lib/aws-apigateway';
|
|
26
29
|
import { Aspects, Duration<%_ if (backend.type === 'fastapi') { _%>, Stack<%_ } _%> } from 'aws-cdk-lib';
|
|
27
30
|
import {
|
|
@@ -192,6 +195,36 @@ export class <%= apiNameClassName %><
|
|
|
192
195
|
id: string,
|
|
193
196
|
props: <%= apiNameClassName %>Props<TIntegrations>,
|
|
194
197
|
) {
|
|
198
|
+
<%_ if (auth === 'Custom') { _%>
|
|
199
|
+
const authorizerFunction = new Function(scope, '<%= apiNameClassName %>AuthorizerFunction', {
|
|
200
|
+
<%_ if (['trpc', 'smithy'].includes(backend.type)) { _%>
|
|
201
|
+
runtime: Runtime.NODEJS_LATEST,
|
|
202
|
+
handler: 'index.handler',
|
|
203
|
+
code: Code.fromAsset(
|
|
204
|
+
url.fileURLToPath(
|
|
205
|
+
new URL(
|
|
206
|
+
'../../../../../../<%- backend.authorizerBundleOutputDir %>',
|
|
207
|
+
import.meta.url,
|
|
208
|
+
),
|
|
209
|
+
),
|
|
210
|
+
),
|
|
211
|
+
<%_ } else if (backend.type === 'fastapi') { _%>
|
|
212
|
+
runtime: Runtime.PYTHON_3_14,
|
|
213
|
+
handler: '<%- backend.moduleName %>.authorizer.handler',
|
|
214
|
+
code: Code.fromAsset(
|
|
215
|
+
url.fileURLToPath(
|
|
216
|
+
new URL(
|
|
217
|
+
'../../../../../../<%- backend.bundleOutputDir %>',
|
|
218
|
+
import.meta.url,
|
|
219
|
+
),
|
|
220
|
+
),
|
|
221
|
+
),
|
|
222
|
+
<%_ } _%>
|
|
223
|
+
timeout: Duration.seconds(10),
|
|
224
|
+
tracing: Tracing.ACTIVE,
|
|
225
|
+
});
|
|
226
|
+
<%_ } _%>
|
|
227
|
+
|
|
195
228
|
super(scope, id, {
|
|
196
229
|
apiName: '<%= apiNameClassName %>',
|
|
197
230
|
defaultMethodOptions: {
|
|
@@ -202,8 +235,11 @@ export class <%= apiNameClassName %><
|
|
|
202
235
|
authorizer: new CognitoUserPoolsAuthorizer(scope, '<%= apiNameClassName %>Authorizer', {
|
|
203
236
|
cognitoUserPools: [props.identity.userPool],
|
|
204
237
|
}),
|
|
205
|
-
<%_ } else if (auth === '
|
|
206
|
-
authorizationType: AuthorizationType.
|
|
238
|
+
<%_ } else if (auth === 'Custom') { _%>
|
|
239
|
+
authorizationType: AuthorizationType.CUSTOM,
|
|
240
|
+
authorizer: new TokenAuthorizer(scope, '<%= apiNameClassName %>TokenAuthorizer', {
|
|
241
|
+
handler: authorizerFunction,
|
|
242
|
+
}),
|
|
207
243
|
<%_ } _%>
|
|
208
244
|
},
|
|
209
245
|
deployOptions: {
|
|
@@ -220,7 +256,7 @@ export class <%= apiNameClassName %><
|
|
|
220
256
|
resources: ['execute-api:/*/OPTIONS/*'],
|
|
221
257
|
}),
|
|
222
258
|
<%_ } else { _%>
|
|
223
|
-
// Allow all callers to invoke the API in the resource policy<% if (auth === 'Cognito') { %>, since auth is handled by Cognito<% } %>
|
|
259
|
+
// Allow all callers to invoke the API in the resource policy<% if (auth === 'Cognito') { %>, since auth is handled by Cognito<% } else if (auth === 'Custom') { %>, since auth is handled by the Lambda Authorizer<% } %>
|
|
224
260
|
new PolicyStatement({
|
|
225
261
|
effect: Effect.ALLOW,
|
|
226
262
|
principals: [new AnyPrincipal()],
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import middy from '@middy/core';
|
|
2
|
+
import { Tracer } from '@aws-lambda-powertools/tracer';
|
|
3
|
+
import { captureLambdaHandler } from '@aws-lambda-powertools/tracer/middleware';
|
|
4
|
+
import { injectLambdaContext } from '@aws-lambda-powertools/logger/middleware';
|
|
5
|
+
import { Logger } from '@aws-lambda-powertools/logger';
|
|
6
|
+
import { parser } from '@aws-lambda-powertools/parser/middleware';
|
|
7
|
+
import { APIGatewayRequestAuthorizerEventV2Schema } from '@aws-lambda-powertools/parser/schemas';
|
|
8
|
+
import { z } from 'zod';
|
|
9
|
+
import type { APIGatewaySimpleAuthorizerWithContextResult } from 'aws-lambda';
|
|
10
|
+
|
|
11
|
+
const tracer = new Tracer();
|
|
12
|
+
const logger = new Logger();
|
|
13
|
+
|
|
14
|
+
type AuthorizerEvent = z.infer<typeof APIGatewayRequestAuthorizerEventV2Schema>;
|
|
15
|
+
|
|
16
|
+
const authorize = async (
|
|
17
|
+
event: AuthorizerEvent,
|
|
18
|
+
): Promise<APIGatewaySimpleAuthorizerWithContextResult<Record<string, string>>> => {
|
|
19
|
+
// TODO: Implement your custom authorization logic here.
|
|
20
|
+
// Example: validate a bearer token, check an API key, verify a JWT, etc.
|
|
21
|
+
//
|
|
22
|
+
// const token = event.headers?.['authorization'];
|
|
23
|
+
// if (isValid(token)) {
|
|
24
|
+
// return { isAuthorized: true, context: {} };
|
|
25
|
+
// }
|
|
26
|
+
|
|
27
|
+
return { isAuthorized: false, context: {} };
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
export const handler = middy()
|
|
31
|
+
.use(captureLambdaHandler(tracer))
|
|
32
|
+
.use(injectLambdaContext(logger))
|
|
33
|
+
.use(parser({ schema: APIGatewayRequestAuthorizerEventV2Schema }))
|
|
34
|
+
.handler(authorize);
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import middy from '@middy/core';
|
|
2
|
+
import { Tracer } from '@aws-lambda-powertools/tracer';
|
|
3
|
+
import { captureLambdaHandler } from '@aws-lambda-powertools/tracer/middleware';
|
|
4
|
+
import { injectLambdaContext } from '@aws-lambda-powertools/logger/middleware';
|
|
5
|
+
import { Logger } from '@aws-lambda-powertools/logger';
|
|
6
|
+
import { parser } from '@aws-lambda-powertools/parser/middleware';
|
|
7
|
+
import { APIGatewayRequestAuthorizerEventSchema } from '@aws-lambda-powertools/parser/schemas';
|
|
8
|
+
import { z } from 'zod';
|
|
9
|
+
import type { APIGatewayAuthorizerResult } from 'aws-lambda';
|
|
10
|
+
|
|
11
|
+
const tracer = new Tracer();
|
|
12
|
+
const logger = new Logger();
|
|
13
|
+
|
|
14
|
+
type AuthorizerEvent = z.infer<typeof APIGatewayRequestAuthorizerEventSchema>;
|
|
15
|
+
|
|
16
|
+
const authorize = async (
|
|
17
|
+
event: AuthorizerEvent,
|
|
18
|
+
): Promise<APIGatewayAuthorizerResult> => {
|
|
19
|
+
// TODO: Implement your custom authorization logic here.
|
|
20
|
+
// Example: validate a bearer token, check an API key, verify a JWT, etc.
|
|
21
|
+
//
|
|
22
|
+
// const token = event.headers?.['authorization'];
|
|
23
|
+
// if (isValid(token)) {
|
|
24
|
+
// return generatePolicy('user', 'Allow', event.methodArn);
|
|
25
|
+
// }
|
|
26
|
+
|
|
27
|
+
return generatePolicy('user', 'Deny', event.methodArn);
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
const generatePolicy = (
|
|
31
|
+
principalId: string,
|
|
32
|
+
effect: 'Allow' | 'Deny',
|
|
33
|
+
resource: string,
|
|
34
|
+
): APIGatewayAuthorizerResult => ({
|
|
35
|
+
principalId,
|
|
36
|
+
policyDocument: {
|
|
37
|
+
Version: '2012-10-17',
|
|
38
|
+
Statement: [
|
|
39
|
+
{
|
|
40
|
+
Action: 'execute-api:Invoke',
|
|
41
|
+
Effect: effect,
|
|
42
|
+
Resource: resource,
|
|
43
|
+
},
|
|
44
|
+
],
|
|
45
|
+
},
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
export const handler = middy()
|
|
49
|
+
.use(captureLambdaHandler(tracer))
|
|
50
|
+
.use(injectLambdaContext(logger))
|
|
51
|
+
.use(parser({ schema: APIGatewayRequestAuthorizerEventSchema }))
|
|
52
|
+
.handler(authorize);
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
from aws_lambda_powertools import Logger, Tracer
|
|
2
|
+
from aws_lambda_powertools.utilities.parser import event_parser
|
|
3
|
+
from aws_lambda_powertools.utilities.parser.models import (
|
|
4
|
+
ApiGatewayAuthorizerRequestV2,
|
|
5
|
+
)
|
|
6
|
+
from aws_lambda_powertools.utilities.typing import LambdaContext
|
|
7
|
+
|
|
8
|
+
logger = Logger()
|
|
9
|
+
tracer = Tracer()
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
@tracer.capture_lambda_handler
|
|
13
|
+
@logger.inject_lambda_context
|
|
14
|
+
@event_parser(model=ApiGatewayAuthorizerRequestV2)
|
|
15
|
+
def handler(event: ApiGatewayAuthorizerRequestV2, context: LambdaContext) -> dict:
|
|
16
|
+
# TODO: Implement your custom authorization logic here.
|
|
17
|
+
# Example: validate a bearer token, check an API key, verify a JWT, etc.
|
|
18
|
+
#
|
|
19
|
+
# token = event.headers.get("authorization") if event.headers else None
|
|
20
|
+
# if is_valid(token):
|
|
21
|
+
# return {"isAuthorized": True, "context": {}}
|
|
22
|
+
|
|
23
|
+
return {"isAuthorized": False, "context": {}}
|
|
24
|
+
|
|
25
|
+
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
from aws_lambda_powertools import Logger, Tracer
|
|
2
|
+
from aws_lambda_powertools.utilities.parser import event_parser
|
|
3
|
+
from aws_lambda_powertools.utilities.parser.models import (
|
|
4
|
+
ApiGatewayAuthorizerRequest,
|
|
5
|
+
)
|
|
6
|
+
from aws_lambda_powertools.utilities.typing import LambdaContext
|
|
7
|
+
|
|
8
|
+
logger = Logger()
|
|
9
|
+
tracer = Tracer()
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
@tracer.capture_lambda_handler
|
|
13
|
+
@logger.inject_lambda_context
|
|
14
|
+
@event_parser(model=ApiGatewayAuthorizerRequest)
|
|
15
|
+
def handler(event: ApiGatewayAuthorizerRequest, context: LambdaContext) -> dict:
|
|
16
|
+
# TODO: Implement your custom authorization logic here.
|
|
17
|
+
# Example: validate a bearer token, check an API key, verify a JWT, etc.
|
|
18
|
+
#
|
|
19
|
+
# token = event.headers.get("authorization") if event.headers else None
|
|
20
|
+
# if is_valid(token):
|
|
21
|
+
# return _generate_policy("user", "Allow", event.methodArn)
|
|
22
|
+
|
|
23
|
+
return _generate_policy("user", "Deny", event.methodArn)
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
def _generate_policy(principal_id: str, effect: str, resource: str) -> dict:
|
|
27
|
+
return {
|
|
28
|
+
"principalId": principal_id,
|
|
29
|
+
"policyDocument": {
|
|
30
|
+
"Version": "2012-10-17",
|
|
31
|
+
"Statement": [
|
|
32
|
+
{
|
|
33
|
+
"Action": "execute-api:Invoke",
|
|
34
|
+
"Effect": effect,
|
|
35
|
+
"Resource": resource,
|
|
36
|
+
}
|
|
37
|
+
],
|
|
38
|
+
},
|
|
39
|
+
}
|