cdk-serverless 2.22.4 → 3.0.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/README.md +64 -0
- package/docs/constructs/assets/highlight.css +4 -4
- package/docs/constructs/classes/LambdaFunction.html +8 -8
- package/docs/constructs/index.html +45 -1
- package/docs/lambda/assets/highlight.css +9 -2
- package/docs/lambda/classes/errors.BadRequestError.html +1 -1
- package/docs/lambda/classes/errors.ForbiddenError.html +1 -1
- package/docs/lambda/classes/errors.HttpError.html +1 -1
- package/docs/lambda/classes/errors.NotFoundError.html +1 -1
- package/docs/lambda/classes/errors.UnauthenticatedError.html +1 -1
- package/docs/lambda/index.html +45 -1
- package/docs/projen/assets/highlight.css +13 -6
- package/docs/projen/index.html +45 -1
- package/docs/projen/interfaces/ServerlessProjectOptions.html +4 -4
- package/lib/constructs/authentication.js +2 -2
- package/lib/constructs/graphql.js +3 -3
- package/lib/constructs/rest-api.js +2 -2
- package/lib/lambda/auth.js +10 -4
- package/lib/projen/core.js +1 -3
- package/lib/projen/datastore.js +6 -7
- package/lib/projen/lazy-sampledir.js +9 -9
- package/lib/projen/rest-api.js +4 -4
- package/lib/projen/workflow.js +4 -4
- package/lib/tests/http-client.d.ts +48 -0
- package/lib/tests/http-client.js +82 -0
- package/lib/tests/index.d.ts +1 -0
- package/lib/tests/index.js +2 -1
- package/lib/tests/integ-test-util.d.ts +4 -3
- package/lib/tests/integ-test-util.js +14 -27
- package/package.json +2 -5
- package/specs/remove-axios-dependency.md +240 -0
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* A minimal HTTP client used by IntegTestUtil, backed by the native `fetch`
|
|
4
|
+
* API. It exists to keep the integration-test API stable while removing the
|
|
5
|
+
* `axios` runtime dependency.
|
|
6
|
+
*/
|
|
7
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
+
exports.HttpClient = exports.HttpClientResponse = void 0;
|
|
9
|
+
/**
|
|
10
|
+
* Response wrapper returned by every `HttpClient` request method.
|
|
11
|
+
*/
|
|
12
|
+
class HttpClientResponse {
|
|
13
|
+
constructor(status, ok, headers, body) {
|
|
14
|
+
this.status = status;
|
|
15
|
+
this.ok = ok;
|
|
16
|
+
this.headers = headers;
|
|
17
|
+
this.body = body;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Parse the response body as JSON. Throws if the body is not valid JSON.
|
|
21
|
+
*/
|
|
22
|
+
json() {
|
|
23
|
+
return JSON.parse(this.body);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
exports.HttpClientResponse = HttpClientResponse;
|
|
27
|
+
class HttpClient {
|
|
28
|
+
constructor(config = {}) {
|
|
29
|
+
this.baseURL = config.baseURL;
|
|
30
|
+
this.defaultHeaders = { ...(config.headers ?? {}) };
|
|
31
|
+
}
|
|
32
|
+
get(path, options) {
|
|
33
|
+
return this.request('GET', path, undefined, options);
|
|
34
|
+
}
|
|
35
|
+
delete(path, options) {
|
|
36
|
+
return this.request('DELETE', path, undefined, options);
|
|
37
|
+
}
|
|
38
|
+
post(path, body, options) {
|
|
39
|
+
return this.request('POST', path, body, options);
|
|
40
|
+
}
|
|
41
|
+
put(path, body, options) {
|
|
42
|
+
return this.request('PUT', path, body, options);
|
|
43
|
+
}
|
|
44
|
+
patch(path, body, options) {
|
|
45
|
+
return this.request('PATCH', path, body, options);
|
|
46
|
+
}
|
|
47
|
+
async request(method, path, body, options) {
|
|
48
|
+
const url = this.resolveUrl(path);
|
|
49
|
+
const headers = {
|
|
50
|
+
...this.defaultHeaders,
|
|
51
|
+
...(options?.headers ?? {}),
|
|
52
|
+
};
|
|
53
|
+
let requestBody;
|
|
54
|
+
if (body !== undefined && body !== null) {
|
|
55
|
+
if (typeof body === 'string') {
|
|
56
|
+
requestBody = body;
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
requestBody = JSON.stringify(body);
|
|
60
|
+
if (!Object.keys(headers).some((h) => h.toLowerCase() === 'content-type')) {
|
|
61
|
+
headers['Content-Type'] = 'application/json';
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
const res = await fetch(url, { method, headers, body: requestBody });
|
|
66
|
+
const responseBody = await res.text();
|
|
67
|
+
return new HttpClientResponse(res.status, res.ok, res.headers, responseBody);
|
|
68
|
+
}
|
|
69
|
+
resolveUrl(path) {
|
|
70
|
+
if (!this.baseURL) {
|
|
71
|
+
return path;
|
|
72
|
+
}
|
|
73
|
+
if (/^https?:\/\//i.test(path)) {
|
|
74
|
+
return path;
|
|
75
|
+
}
|
|
76
|
+
const base = this.baseURL.endsWith('/') ? this.baseURL.slice(0, -1) : this.baseURL;
|
|
77
|
+
const suffix = path.startsWith('/') ? path : `/${path}`;
|
|
78
|
+
return `${base}${suffix}`;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
exports.HttpClient = HttpClient;
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/tests/http-client.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * A minimal HTTP client used by IntegTestUtil, backed by the native `fetch`\n * API. It exists to keep the integration-test API stable while removing the\n * `axios` runtime dependency.\n */\n\nexport interface HttpClientConfig {\n  /**\n   * Base URL prepended to relative paths passed to client methods.\n   */\n  readonly baseURL?: string;\n\n  /**\n   * Default headers applied to every request issued by this client.\n   * Per-request headers override these on collision.\n   */\n  readonly headers?: Record<string, string>;\n}\n\nexport interface HttpClientRequestOptions {\n  /**\n   * Per-request headers, merged on top of the client's default headers.\n   */\n  readonly headers?: Record<string, string>;\n}\n\n/**\n * Response wrapper returned by every `HttpClient` request method.\n */\nexport class HttpClientResponse {\n  public readonly status: number;\n  public readonly ok: boolean;\n  public readonly headers: Headers;\n  public readonly body: string;\n\n  constructor(status: number, ok: boolean, headers: Headers, body: string) {\n    this.status = status;\n    this.ok = ok;\n    this.headers = headers;\n    this.body = body;\n  }\n\n  /**\n   * Parse the response body as JSON. Throws if the body is not valid JSON.\n   */\n  public json<T = unknown>(): T {\n    return JSON.parse(this.body) as T;\n  }\n}\n\nexport class HttpClient {\n  private readonly baseURL?: string;\n  private readonly defaultHeaders: Record<string, string>;\n\n  constructor(config: HttpClientConfig = {}) {\n    this.baseURL = config.baseURL;\n    this.defaultHeaders = { ...(config.headers ?? {}) };\n  }\n\n  public get(path: string, options?: HttpClientRequestOptions): Promise<HttpClientResponse> {\n    return this.request('GET', path, undefined, options);\n  }\n\n  public delete(path: string, options?: HttpClientRequestOptions): Promise<HttpClientResponse> {\n    return this.request('DELETE', path, undefined, options);\n  }\n\n  public post(path: string, body?: unknown, options?: HttpClientRequestOptions): Promise<HttpClientResponse> {\n    return this.request('POST', path, body, options);\n  }\n\n  public put(path: string, body?: unknown, options?: HttpClientRequestOptions): Promise<HttpClientResponse> {\n    return this.request('PUT', path, body, options);\n  }\n\n  public patch(path: string, body?: unknown, options?: HttpClientRequestOptions): Promise<HttpClientResponse> {\n    return this.request('PATCH', path, body, options);\n  }\n\n  private async request(method: string, path: string, body: unknown, options?: HttpClientRequestOptions): Promise<HttpClientResponse> {\n    const url = this.resolveUrl(path);\n    const headers: Record<string, string> = {\n      ...this.defaultHeaders,\n      ...(options?.headers ?? {}),\n    };\n\n    let requestBody: BodyInit | undefined;\n    if (body !== undefined && body !== null) {\n      if (typeof body === 'string') {\n        requestBody = body;\n      } else {\n        requestBody = JSON.stringify(body);\n        if (!Object.keys(headers).some((h) => h.toLowerCase() === 'content-type')) {\n          headers['Content-Type'] = 'application/json';\n        }\n      }\n    }\n\n    const res = await fetch(url, { method, headers, body: requestBody });\n    const responseBody = await res.text();\n    return new HttpClientResponse(res.status, res.ok, res.headers, responseBody);\n  }\n\n  private resolveUrl(path: string): string {\n    if (!this.baseURL) {\n      return path;\n    }\n    if (/^https?:\\/\\//i.test(path)) {\n      return path;\n    }\n    const base = this.baseURL.endsWith('/') ? this.baseURL.slice(0, -1) : this.baseURL;\n    const suffix = path.startsWith('/') ? path : `/${path}`;\n    return `${base}${suffix}`;\n  }\n}\n"]}
|
package/lib/tests/index.d.ts
CHANGED
package/lib/tests/index.js
CHANGED
|
@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./http-client"), exports);
|
|
17
18
|
__exportStar(require("./integ-test-util"), exports);
|
|
18
19
|
__exportStar(require("./lambda-test-utils"), exports);
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGdEQUE4QjtBQUM5QixvREFBa0M7QUFDbEMsc0RBQW9DIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSAnLi9odHRwLWNsaWVudCc7XG5leHBvcnQgKiBmcm9tICcuL2ludGVnLXRlc3QtdXRpbCc7XG5leHBvcnQgKiBmcm9tICcuL2xhbWJkYS10ZXN0LXV0aWxzJzsiXX0=
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { NativeAttributeValue } from '@aws-sdk/lib-dynamodb';
|
|
2
|
-
import { Axios, AxiosRequestConfig } from 'axios';
|
|
3
2
|
import { JwtPayload } from 'jsonwebtoken';
|
|
3
|
+
import { HttpClient, HttpClientConfig } from './http-client';
|
|
4
|
+
export { HttpClient, HttpClientConfig, HttpClientResponse } from './http-client';
|
|
4
5
|
export interface IntegTestUtilOptions {
|
|
5
6
|
readonly region: string;
|
|
6
7
|
readonly apiOptions?: {
|
|
@@ -28,8 +29,8 @@ export declare class IntegTestUtil {
|
|
|
28
29
|
private apiTokens;
|
|
29
30
|
private itemsToDelete;
|
|
30
31
|
constructor(options: IntegTestUtilOptions);
|
|
31
|
-
getClient(config?:
|
|
32
|
-
getAuthenticatedClient(email: string, password?: string, config?:
|
|
32
|
+
getClient(config?: HttpClientConfig): HttpClient;
|
|
33
|
+
getAuthenticatedClient(email: string, password?: string, config?: HttpClientConfig): Promise<HttpClient>;
|
|
33
34
|
initializeItemsToCleanup(): void;
|
|
34
35
|
addItemToDeleteAfterTest(key: Record<string, NativeAttributeValue>): void;
|
|
35
36
|
cleanupItems(): Promise<void>;
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.IntegTestUtil = void 0;
|
|
3
|
+
exports.IntegTestUtil = exports.HttpClientResponse = exports.HttpClient = void 0;
|
|
4
4
|
exports.parseCfnOutputs = parseCfnOutputs;
|
|
5
5
|
const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
|
|
6
6
|
const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
|
|
7
7
|
const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
|
|
8
|
-
const axios_1 = require("axios");
|
|
9
8
|
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
9
|
+
const http_client_1 = require("./http-client");
|
|
10
10
|
const outputs_1 = require("../shared/outputs");
|
|
11
|
+
var http_client_2 = require("./http-client");
|
|
12
|
+
Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return http_client_2.HttpClient; } });
|
|
13
|
+
Object.defineProperty(exports, "HttpClientResponse", { enumerable: true, get: function () { return http_client_2.HttpClientResponse; } });
|
|
11
14
|
function parseCfnOutputs(output, stackName, config) {
|
|
12
15
|
const outputs = output[stackName];
|
|
13
16
|
return {
|
|
@@ -39,24 +42,8 @@ class IntegTestUtil {
|
|
|
39
42
|
}
|
|
40
43
|
// AUTH
|
|
41
44
|
getClient(config) {
|
|
42
|
-
return new
|
|
45
|
+
return new http_client_1.HttpClient({
|
|
43
46
|
baseURL: this.options.apiOptions?.baseURL,
|
|
44
|
-
transformResponse: (data) => {
|
|
45
|
-
try {
|
|
46
|
-
return JSON.parse(data);
|
|
47
|
-
}
|
|
48
|
-
catch (error) {
|
|
49
|
-
return data;
|
|
50
|
-
}
|
|
51
|
-
},
|
|
52
|
-
transformRequest: (data) => {
|
|
53
|
-
try {
|
|
54
|
-
return JSON.stringify(data);
|
|
55
|
-
}
|
|
56
|
-
catch (error) {
|
|
57
|
-
return data;
|
|
58
|
-
}
|
|
59
|
-
},
|
|
60
47
|
...config,
|
|
61
48
|
});
|
|
62
49
|
}
|
|
@@ -68,11 +55,11 @@ class IntegTestUtil {
|
|
|
68
55
|
await this.loginUser(email, password);
|
|
69
56
|
}
|
|
70
57
|
return this.getClient({
|
|
58
|
+
...config,
|
|
71
59
|
headers: {
|
|
72
60
|
Authorization: `Bearer ${this.apiTokens[email].token}`,
|
|
73
61
|
...(config?.headers ?? {}),
|
|
74
62
|
},
|
|
75
|
-
...config,
|
|
76
63
|
});
|
|
77
64
|
}
|
|
78
65
|
// DATASTORE
|
|
@@ -153,31 +140,31 @@ class IntegTestUtil {
|
|
|
153
140
|
if (!this.options.authOptions?.userPoolClientId) {
|
|
154
141
|
throw new Error('No userPoolClientId configured');
|
|
155
142
|
}
|
|
156
|
-
const cognitoClient = new
|
|
143
|
+
const cognitoClient = new http_client_1.HttpClient({
|
|
157
144
|
baseURL: `https://cognito-idp.${this.options.region}.amazonaws.com/`,
|
|
158
145
|
});
|
|
159
|
-
const auth = await cognitoClient.post('/',
|
|
146
|
+
const auth = await cognitoClient.post('/', {
|
|
160
147
|
AuthParameters: {
|
|
161
148
|
USERNAME: email,
|
|
162
149
|
PASSWORD: password,
|
|
163
150
|
},
|
|
164
151
|
AuthFlow: 'USER_PASSWORD_AUTH',
|
|
165
152
|
ClientId: this.options.authOptions.userPoolClientId,
|
|
166
|
-
}
|
|
153
|
+
}, {
|
|
167
154
|
headers: {
|
|
168
155
|
'Content-Type': 'application/x-amz-json-1.1',
|
|
169
156
|
'X-Amz-Target': 'AWSCognitoIdentityProviderService.InitiateAuth',
|
|
170
157
|
},
|
|
171
158
|
});
|
|
172
|
-
if (auth.
|
|
159
|
+
if (!auth.ok) {
|
|
173
160
|
throw new Error(`Failed to authenticate user ${email}`);
|
|
174
161
|
}
|
|
175
|
-
const token =
|
|
162
|
+
const token = (await auth.json()).AuthenticationResult.IdToken;
|
|
176
163
|
this.apiTokens[email] = {
|
|
177
164
|
token,
|
|
178
|
-
payload: (0, jsonwebtoken_1.decode)(
|
|
165
|
+
payload: (0, jsonwebtoken_1.decode)(token),
|
|
179
166
|
};
|
|
180
167
|
}
|
|
181
168
|
}
|
|
182
169
|
exports.IntegTestUtil = IntegTestUtil;
|
|
183
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"integ-test-util.js","sourceRoot":"","sources":["../../src/tests/integ-test-util.ts"],"names":[],"mappings":"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","sourcesContent":["import { AdminAddUserToGroupCommand, AdminCreateUserCommand, AdminDeleteUserCommand, AdminSetUserPasswordCommand, CognitoIdentityProviderClient, MessageActionType } from '@aws-sdk/client-cognito-identity-provider';\nimport { DynamoDBClient } from '@aws-sdk/client-dynamodb';\nimport { DeleteCommand, DynamoDBDocumentClient, NativeAttributeValue } from '@aws-sdk/lib-dynamodb';\nimport { Axios, AxiosRequestConfig, HttpStatusCode } from 'axios';\nimport { decode, JwtPayload } from 'jsonwebtoken';\nimport { CFN_OUTPUT_SUFFIX_AUTH_IDENTITYPOOL_ID, CFN_OUTPUT_SUFFIX_AUTH_USERPOOLID, CFN_OUTPUT_SUFFIX_AUTH_USERPOOL_CLIENTID, CFN_OUTPUT_SUFFIX_DATASTORE_TABLENAME, CFN_OUTPUT_SUFFIX_RESTAPI_URL } from '../shared/outputs';\n\nexport interface IntegTestUtilOptions {\n\n  readonly region: string;\n\n  readonly apiOptions?: {\n    readonly baseURL?: string;\n  };\n\n  readonly authOptions?: {\n    readonly userPoolId?: string;\n\n    readonly userPoolClientId?: string;\n    readonly userPoolClientSecret?: string;\n\n    readonly identityPoolId?: string;\n  };\n\n  readonly datastoreOptions?: {\n    readonly tableName?: string;\n  };\n\n}\n\nexport interface CfnOutputConfig {\n  readonly region: string;\n  readonly apiName: string;\n  readonly datastoreName: string;\n}\n\nexport function parseCfnOutputs(output: any, stackName: string, config: CfnOutputConfig): IntegTestUtilOptions {\n  const outputs = output[stackName];\n  return {\n    region: config.region,\n    apiOptions: {\n      baseURL: outputs[`${config.apiName}${CFN_OUTPUT_SUFFIX_RESTAPI_URL}`],\n    },\n    authOptions: {\n      userPoolId: outputs[CFN_OUTPUT_SUFFIX_AUTH_USERPOOLID],\n      userPoolClientId: outputs[CFN_OUTPUT_SUFFIX_AUTH_USERPOOL_CLIENTID],\n      identityPoolId: outputs[CFN_OUTPUT_SUFFIX_AUTH_IDENTITYPOOL_ID],\n    },\n    datastoreOptions: {\n      tableName: `${config.datastoreName}${outputs[CFN_OUTPUT_SUFFIX_DATASTORE_TABLENAME]}`,\n    },\n  };\n}\n\ninterface TokenInfo {\n  readonly token: string;\n  readonly payload: JwtPayload;\n}\n\nexport class IntegTestUtil {\n\n  public readonly tableName?: string;\n\n  private apiTokens: { [email: string]: TokenInfo } = {};\n  private itemsToDelete: Record<string, NativeAttributeValue>[] = [];\n\n  constructor(protected options: IntegTestUtilOptions) {\n    process.env.AWS_REGION = options.region;\n    process.env.AWS_DEFAULT_REGION = options.region;\n    if (options.datastoreOptions?.tableName) {\n      process.env.TABLE = options.datastoreOptions.tableName;\n      this.tableName = options.datastoreOptions.tableName;\n    }\n  }\n\n  // AUTH\n\n  public getClient(config?: AxiosRequestConfig) {\n    return new Axios({\n      baseURL: this.options.apiOptions?.baseURL,\n      transformResponse: (data) => {\n        try {\n          return JSON.parse(data);\n        } catch (error) {\n          return data;\n        }\n      },\n      transformRequest: (data) => {\n        try {\n          return JSON.stringify(data);\n        } catch (error) {\n          return data;\n        }\n      },\n      ...config,\n    });\n  }\n\n  public async getAuthenticatedClient(email: string, password?: string, config?: AxiosRequestConfig) {\n    if (!this.apiTokens[email]) {\n      if (!password) {\n        throw new Error('No password provided; You can only leave password blank for users created by this utility');\n      }\n      await this.loginUser(email, password);\n    }\n    return this.getClient({\n      headers: {\n        Authorization: `Bearer ${this.apiTokens[email].token}`,\n        ...(config?.headers ?? {}),\n      },\n      ...config,\n    });\n  }\n\n  // DATASTORE\n\n  public initializeItemsToCleanup() {\n    this.itemsToDelete = [];\n  }\n\n  public addItemToDeleteAfterTest(key: Record<string, NativeAttributeValue>) {\n    this.itemsToDelete.push(key);\n  }\n\n  public async cleanupItems() {\n    const ddb = DynamoDBDocumentClient.from(new DynamoDBClient({ region: this.options.region }));\n    for (const item of this.itemsToDelete) {\n      try {\n        await ddb.send(new DeleteCommand({ TableName: this.tableName, Key: item }));\n      } catch (error) {\n        console.log(error);\n      }\n    }\n  }\n\n  // AUTH\n\n  public getTokenPayload(email: string): JwtPayload | undefined {\n    return this.apiTokens[email]?.payload;\n  }\n\n  public async createUser(email: string, attributes: { [key: string]: string }, groups: string[]) {\n    if (!this.options.authOptions?.userPoolId) {\n      throw new Error('No userPoolId configured');\n    }\n\n    const randomPassword: string = Math.random().toString(36).slice(-16);\n\n    const cognitoClient: CognitoIdentityProviderClient = new CognitoIdentityProviderClient({ region: this.options.region });\n    // Create a new user in Cognito\n    await cognitoClient.send(new AdminCreateUserCommand({\n      UserPoolId: this.options.authOptions?.userPoolId,\n      Username: email,\n      MessageAction: MessageActionType.SUPPRESS,\n      TemporaryPassword: randomPassword,\n      UserAttributes: [{\n        Name: 'email',\n        Value: email,\n      }, {\n        Name: 'email_verified',\n        Value: 'true',\n      },\n      ...Object.entries(attributes).map((attr) => ({\n        Name: attr[0],\n        Value: attr[1],\n      }))],\n    }));\n    // Make password permanent to get user out of FORCE_CHANGE_PASSWORD\n    await cognitoClient.send(new AdminSetUserPasswordCommand({\n      UserPoolId: this.options.authOptions?.userPoolId,\n      Username: email,\n      Password: randomPassword,\n      Permanent: true,\n    }));\n    // Add user to groups\n    for (const group of groups) {\n      await cognitoClient.send(new AdminAddUserToGroupCommand({\n        UserPoolId: this.options.authOptions?.userPoolId,\n        Username: email,\n        GroupName: group,\n      }));\n    }\n\n    await this.loginUser(email, randomPassword);\n  }\n\n  public async removeUser(email: string) {\n    if (!this.options.authOptions?.userPoolId) {\n      throw new Error('No userPoolId configured');\n    }\n    const cognitoClient: CognitoIdentityProviderClient = new CognitoIdentityProviderClient({ region: this.options.region });\n    await cognitoClient.send(new AdminDeleteUserCommand({\n      UserPoolId: this.options.authOptions?.userPoolId,\n      Username: email,\n    }));\n    delete this.apiTokens[email];\n  }\n\n\n  protected async loginUser(email: string, password: string) {\n    if (!this.options.authOptions?.userPoolClientId) {\n      throw new Error('No userPoolClientId configured');\n    }\n    const cognitoClient = new Axios({\n      baseURL: `https://cognito-idp.${this.options.region}.amazonaws.com/`,\n    });\n    const auth = await cognitoClient.post('/', JSON.stringify({\n      AuthParameters: {\n        USERNAME: email,\n        PASSWORD: password,\n      },\n      AuthFlow: 'USER_PASSWORD_AUTH',\n      ClientId: this.options.authOptions.userPoolClientId,\n    }), {\n      headers: {\n        'Content-Type': 'application/x-amz-json-1.1',\n        'X-Amz-Target': 'AWSCognitoIdentityProviderService.InitiateAuth',\n      },\n    });\n    if (auth.status !== HttpStatusCode.Ok) {\n      throw new Error(`Failed to authenticate user ${email}`);\n    }\n    const token = JSON.parse(auth.data).AuthenticationResult.IdToken;\n    this.apiTokens[email] = {\n      token,\n      payload: decode(this.apiTokens[email].token) as JwtPayload,\n    };\n  }\n}"]}
|
|
170
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"integ-test-util.js","sourceRoot":"","sources":["../../src/tests/integ-test-util.ts"],"names":[],"mappings":";;;AAsCA,0CAgBC;AAtDD,gGAAsN;AACtN,8DAA0D;AAC1D,wDAAoG;AACpG,+CAAkD;AAClD,+CAA6D;AAC7D,+CAA8N;AAE9N,6CAAiF;AAAxE,yGAAA,UAAU,OAAA;AAAoB,iHAAA,kBAAkB,OAAA;AA+BzD,SAAgB,eAAe,CAAC,MAAW,EAAE,SAAiB,EAAE,MAAuB;IACrF,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAClC,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,UAAU,EAAE;YACV,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,OAAO,GAAG,uCAA6B,EAAE,CAAC;SACtE;QACD,WAAW,EAAE;YACX,UAAU,EAAE,OAAO,CAAC,2CAAiC,CAAC;YACtD,gBAAgB,EAAE,OAAO,CAAC,kDAAwC,CAAC;YACnE,cAAc,EAAE,OAAO,CAAC,gDAAsC,CAAC;SAChE;QACD,gBAAgB,EAAE;YAChB,SAAS,EAAE,GAAG,MAAM,CAAC,aAAa,GAAG,OAAO,CAAC,+CAAqC,CAAC,EAAE;SACtF;KACF,CAAC;AACJ,CAAC;AAOD,MAAa,aAAa;IAOxB,YAAsB,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;QAH3C,cAAS,GAAmC,EAAE,CAAC;QAC/C,kBAAa,GAA2C,EAAE,CAAC;QAGjE,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;QAChD,IAAI,OAAO,CAAC,gBAAgB,EAAE,SAAS,EAAE,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC;YACvD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC;QACtD,CAAC;IACH,CAAC;IAED,OAAO;IAEA,SAAS,CAAC,MAAyB;QACxC,OAAO,IAAI,wBAAU,CAAC;YACpB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO;YACzC,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,KAAa,EAAE,QAAiB,EAAE,MAAyB;QAC7F,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,2FAA2F,CAAC,CAAC;YAC/G,CAAC;YACD,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;YACpB,GAAG,MAAM;YACT,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE;gBACtD,GAAG,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC;aAC3B;SACF,CAAC,CAAC;IACL,CAAC;IAED,YAAY;IAEL,wBAAwB;QAC7B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC1B,CAAC;IAEM,wBAAwB,CAAC,GAAyC;QACvE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,MAAM,GAAG,GAAG,qCAAsB,CAAC,IAAI,CAAC,IAAI,gCAAc,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7F,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACtC,IAAI,CAAC;gBACH,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,4BAAa,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAC9E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;IAEA,eAAe,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACxC,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,KAAa,EAAE,UAAqC,EAAE,MAAgB;QAC5F,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,cAAc,GAAW,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QAErE,MAAM,aAAa,GAAkC,IAAI,gEAA6B,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACxH,+BAA+B;QAC/B,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,yDAAsB,CAAC;YAClD,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU;YAChD,QAAQ,EAAE,KAAK;YACf,aAAa,EAAE,oDAAiB,CAAC,QAAQ;YACzC,iBAAiB,EAAE,cAAc;YACjC,cAAc,EAAE,CAAC;oBACf,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,KAAK;iBACb,EAAE;oBACD,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE,MAAM;iBACd;gBACD,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC3C,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;oBACb,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;iBACf,CAAC,CAAC,CAAC;SACL,CAAC,CAAC,CAAC;QACJ,mEAAmE;QACnE,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,8DAA2B,CAAC;YACvD,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU;YAChD,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE,cAAc;YACxB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC,CAAC;QACJ,qBAAqB;QACrB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,6DAA0B,CAAC;gBACtD,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU;gBAChD,QAAQ,EAAE,KAAK;gBACf,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC,CAAC;QACN,CAAC;QAED,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,KAAa;QACnC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,aAAa,GAAkC,IAAI,gEAA6B,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACxH,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,yDAAsB,CAAC;YAClD,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU;YAChD,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC,CAAC;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAGS,KAAK,CAAC,SAAS,CAAC,KAAa,EAAE,QAAgB;QACvD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,aAAa,GAAG,IAAI,wBAAU,CAAC;YACnC,OAAO,EAAE,uBAAuB,IAAI,CAAC,OAAO,CAAC,MAAM,iBAAiB;SACrE,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE;YACzC,cAAc,EAAE;gBACd,QAAQ,EAAE,KAAK;gBACf,QAAQ,EAAE,QAAQ;aACnB;YACD,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB;SACpD,EAAE;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,4BAA4B;gBAC5C,cAAc,EAAE,gDAAgD;aACjE;SACF,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAiD,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC;QAC9G,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG;YACtB,KAAK;YACL,OAAO,EAAE,IAAA,qBAAM,EAAC,KAAK,CAAe;SACrC,CAAC;IACJ,CAAC;CACF;AA3JD,sCA2JC","sourcesContent":["import { AdminAddUserToGroupCommand, AdminCreateUserCommand, AdminDeleteUserCommand, AdminSetUserPasswordCommand, CognitoIdentityProviderClient, MessageActionType } from '@aws-sdk/client-cognito-identity-provider';\nimport { DynamoDBClient } from '@aws-sdk/client-dynamodb';\nimport { DeleteCommand, DynamoDBDocumentClient, NativeAttributeValue } from '@aws-sdk/lib-dynamodb';\nimport { decode, JwtPayload } from 'jsonwebtoken';\nimport { HttpClient, HttpClientConfig } from './http-client';\nimport { CFN_OUTPUT_SUFFIX_AUTH_IDENTITYPOOL_ID, CFN_OUTPUT_SUFFIX_AUTH_USERPOOLID, CFN_OUTPUT_SUFFIX_AUTH_USERPOOL_CLIENTID, CFN_OUTPUT_SUFFIX_DATASTORE_TABLENAME, CFN_OUTPUT_SUFFIX_RESTAPI_URL } from '../shared/outputs';\n\nexport { HttpClient, HttpClientConfig, HttpClientResponse } from './http-client';\n\nexport interface IntegTestUtilOptions {\n\n  readonly region: string;\n\n  readonly apiOptions?: {\n    readonly baseURL?: string;\n  };\n\n  readonly authOptions?: {\n    readonly userPoolId?: string;\n\n    readonly userPoolClientId?: string;\n    readonly userPoolClientSecret?: string;\n\n    readonly identityPoolId?: string;\n  };\n\n  readonly datastoreOptions?: {\n    readonly tableName?: string;\n  };\n\n}\n\nexport interface CfnOutputConfig {\n  readonly region: string;\n  readonly apiName: string;\n  readonly datastoreName: string;\n}\n\nexport function parseCfnOutputs(output: any, stackName: string, config: CfnOutputConfig): IntegTestUtilOptions {\n  const outputs = output[stackName];\n  return {\n    region: config.region,\n    apiOptions: {\n      baseURL: outputs[`${config.apiName}${CFN_OUTPUT_SUFFIX_RESTAPI_URL}`],\n    },\n    authOptions: {\n      userPoolId: outputs[CFN_OUTPUT_SUFFIX_AUTH_USERPOOLID],\n      userPoolClientId: outputs[CFN_OUTPUT_SUFFIX_AUTH_USERPOOL_CLIENTID],\n      identityPoolId: outputs[CFN_OUTPUT_SUFFIX_AUTH_IDENTITYPOOL_ID],\n    },\n    datastoreOptions: {\n      tableName: `${config.datastoreName}${outputs[CFN_OUTPUT_SUFFIX_DATASTORE_TABLENAME]}`,\n    },\n  };\n}\n\ninterface TokenInfo {\n  readonly token: string;\n  readonly payload: JwtPayload;\n}\n\nexport class IntegTestUtil {\n\n  public readonly tableName?: string;\n\n  private apiTokens: { [email: string]: TokenInfo } = {};\n  private itemsToDelete: Record<string, NativeAttributeValue>[] = [];\n\n  constructor(protected options: IntegTestUtilOptions) {\n    process.env.AWS_REGION = options.region;\n    process.env.AWS_DEFAULT_REGION = options.region;\n    if (options.datastoreOptions?.tableName) {\n      process.env.TABLE = options.datastoreOptions.tableName;\n      this.tableName = options.datastoreOptions.tableName;\n    }\n  }\n\n  // AUTH\n\n  public getClient(config?: HttpClientConfig): HttpClient {\n    return new HttpClient({\n      baseURL: this.options.apiOptions?.baseURL,\n      ...config,\n    });\n  }\n\n  public async getAuthenticatedClient(email: string, password?: string, config?: HttpClientConfig): Promise<HttpClient> {\n    if (!this.apiTokens[email]) {\n      if (!password) {\n        throw new Error('No password provided; You can only leave password blank for users created by this utility');\n      }\n      await this.loginUser(email, password);\n    }\n    return this.getClient({\n      ...config,\n      headers: {\n        Authorization: `Bearer ${this.apiTokens[email].token}`,\n        ...(config?.headers ?? {}),\n      },\n    });\n  }\n\n  // DATASTORE\n\n  public initializeItemsToCleanup() {\n    this.itemsToDelete = [];\n  }\n\n  public addItemToDeleteAfterTest(key: Record<string, NativeAttributeValue>) {\n    this.itemsToDelete.push(key);\n  }\n\n  public async cleanupItems() {\n    const ddb = DynamoDBDocumentClient.from(new DynamoDBClient({ region: this.options.region }));\n    for (const item of this.itemsToDelete) {\n      try {\n        await ddb.send(new DeleteCommand({ TableName: this.tableName, Key: item }));\n      } catch (error) {\n        console.log(error);\n      }\n    }\n  }\n\n  // AUTH\n\n  public getTokenPayload(email: string): JwtPayload | undefined {\n    return this.apiTokens[email]?.payload;\n  }\n\n  public async createUser(email: string, attributes: { [key: string]: string }, groups: string[]) {\n    if (!this.options.authOptions?.userPoolId) {\n      throw new Error('No userPoolId configured');\n    }\n\n    const randomPassword: string = Math.random().toString(36).slice(-16);\n\n    const cognitoClient: CognitoIdentityProviderClient = new CognitoIdentityProviderClient({ region: this.options.region });\n    // Create a new user in Cognito\n    await cognitoClient.send(new AdminCreateUserCommand({\n      UserPoolId: this.options.authOptions?.userPoolId,\n      Username: email,\n      MessageAction: MessageActionType.SUPPRESS,\n      TemporaryPassword: randomPassword,\n      UserAttributes: [{\n        Name: 'email',\n        Value: email,\n      }, {\n        Name: 'email_verified',\n        Value: 'true',\n      },\n      ...Object.entries(attributes).map((attr) => ({\n        Name: attr[0],\n        Value: attr[1],\n      }))],\n    }));\n    // Make password permanent to get user out of FORCE_CHANGE_PASSWORD\n    await cognitoClient.send(new AdminSetUserPasswordCommand({\n      UserPoolId: this.options.authOptions?.userPoolId,\n      Username: email,\n      Password: randomPassword,\n      Permanent: true,\n    }));\n    // Add user to groups\n    for (const group of groups) {\n      await cognitoClient.send(new AdminAddUserToGroupCommand({\n        UserPoolId: this.options.authOptions?.userPoolId,\n        Username: email,\n        GroupName: group,\n      }));\n    }\n\n    await this.loginUser(email, randomPassword);\n  }\n\n  public async removeUser(email: string) {\n    if (!this.options.authOptions?.userPoolId) {\n      throw new Error('No userPoolId configured');\n    }\n    const cognitoClient: CognitoIdentityProviderClient = new CognitoIdentityProviderClient({ region: this.options.region });\n    await cognitoClient.send(new AdminDeleteUserCommand({\n      UserPoolId: this.options.authOptions?.userPoolId,\n      Username: email,\n    }));\n    delete this.apiTokens[email];\n  }\n\n\n  protected async loginUser(email: string, password: string) {\n    if (!this.options.authOptions?.userPoolClientId) {\n      throw new Error('No userPoolClientId configured');\n    }\n    const cognitoClient = new HttpClient({\n      baseURL: `https://cognito-idp.${this.options.region}.amazonaws.com/`,\n    });\n    const auth = await cognitoClient.post('/', {\n      AuthParameters: {\n        USERNAME: email,\n        PASSWORD: password,\n      },\n      AuthFlow: 'USER_PASSWORD_AUTH',\n      ClientId: this.options.authOptions.userPoolClientId,\n    }, {\n      headers: {\n        'Content-Type': 'application/x-amz-json-1.1',\n        'X-Amz-Target': 'AWSCognitoIdentityProviderService.InitiateAuth',\n      },\n    });\n    if (!auth.ok) {\n      throw new Error(`Failed to authenticate user ${email}`);\n    }\n    const token = (await auth.json<{ AuthenticationResult: { IdToken: string } }>()).AuthenticationResult.IdToken;\n    this.apiTokens[email] = {\n      token,\n      payload: decode(token) as JwtPayload,\n    };\n  }\n}"]}
|
package/package.json
CHANGED
|
@@ -44,7 +44,6 @@
|
|
|
44
44
|
"@types/jwk-to-pem": "^2.0.3",
|
|
45
45
|
"@types/lambda-log": "^2.2.1",
|
|
46
46
|
"@types/node": "^18",
|
|
47
|
-
"@types/uuid": "^9.0.8",
|
|
48
47
|
"@typescript-eslint/eslint-plugin": "^8",
|
|
49
48
|
"@typescript-eslint/parser": "^8",
|
|
50
49
|
"aws-cdk-lib": "2.248.0",
|
|
@@ -75,14 +74,12 @@
|
|
|
75
74
|
},
|
|
76
75
|
"dependencies": {
|
|
77
76
|
"@types/aws-lambda": "^8.10.161",
|
|
78
|
-
"axios": "^1.15.0",
|
|
79
77
|
"constructs": "^10.5.1",
|
|
80
78
|
"date-fns": "^4.1.0",
|
|
81
79
|
"js-yaml": "^4.1.1",
|
|
82
80
|
"jsonwebtoken": "^9.0.3",
|
|
83
81
|
"jwk-to-pem": "^2.0.7",
|
|
84
|
-
"lambda-log": "^3.1.0"
|
|
85
|
-
"uuid": "^13.0.0"
|
|
82
|
+
"lambda-log": "^3.1.0"
|
|
86
83
|
},
|
|
87
84
|
"keywords": [
|
|
88
85
|
"aws",
|
|
@@ -102,7 +99,7 @@
|
|
|
102
99
|
"publishConfig": {
|
|
103
100
|
"access": "public"
|
|
104
101
|
},
|
|
105
|
-
"version": "
|
|
102
|
+
"version": "3.0.0",
|
|
106
103
|
"jest": {
|
|
107
104
|
"coverageProvider": "v8",
|
|
108
105
|
"testMatch": [
|
|
@@ -0,0 +1,240 @@
|
|
|
1
|
+
# Spec: Remove the `axios` Runtime Dependency
|
|
2
|
+
|
|
3
|
+
Status: Proposed
|
|
4
|
+
Author: open-constructs
|
|
5
|
+
Target: `cdk-serverless@next` (minor or major release — see Breaking Changes)
|
|
6
|
+
|
|
7
|
+
## Summary
|
|
8
|
+
|
|
9
|
+
Drop `axios` as a runtime dependency of `cdk-serverless` by replacing every
|
|
10
|
+
call site with the platform-native `fetch` API. `axios` is currently declared
|
|
11
|
+
in `dependencies` (`^1.15.0`, `package.json:77`) and therefore ships into
|
|
12
|
+
every Lambda bundle that pulls in `cdk-serverless/lambda`, and into every
|
|
13
|
+
test workspace that pulls in `cdk-serverless/tests`.
|
|
14
|
+
|
|
15
|
+
The Node.js `fetch` global has been stable since Node 21 and available since
|
|
16
|
+
Node 18. The Lambda functions created by this library use
|
|
17
|
+
`Runtime.NODEJS_LATEST` (`src/constructs/func.ts:145`), which today resolves
|
|
18
|
+
to Node 22, so the runtime requirement is already met.
|
|
19
|
+
|
|
20
|
+
## Motivation
|
|
21
|
+
|
|
22
|
+
1. **Smaller Lambda bundles.** `axios` is bundled into the JWT-verifying code
|
|
23
|
+
path that ships with every cdk-serverless Lambda using `auth.ts`. The
|
|
24
|
+
minified+gzipped cost of axios is ~15 KB; with `fetch` that drops to 0.
|
|
25
|
+
2. **Smaller dependency surface.** One fewer third-party runtime dependency
|
|
26
|
+
to track for supply-chain and CVE management. axios has had several
|
|
27
|
+
security advisories (CVE-2023-45857, CVE-2024-39338, etc.) which forced
|
|
28
|
+
downstream upgrades in this library before.
|
|
29
|
+
3. **Cleaner peer story.** With `axios` gone, the `dependencies` section
|
|
30
|
+
only contains things consumers genuinely need at runtime. `@types/aws-lambda`
|
|
31
|
+
stays for typed handler shapes, and we keep the small set of crypto/JWT
|
|
32
|
+
libs.
|
|
33
|
+
4. **Alignment with platform.** AWS Lambda's managed Node runtime ships
|
|
34
|
+
`fetch` and `undici` natively; using them avoids re-shipping HTTP client
|
|
35
|
+
code that the runtime already provides.
|
|
36
|
+
|
|
37
|
+
## Non-Goals
|
|
38
|
+
|
|
39
|
+
- Replacing `jsonwebtoken` / `jwk-to-pem`. These do crypto, not HTTP, and
|
|
40
|
+
there is no equivalent built-in.
|
|
41
|
+
- Replacing the AWS SDK clients used in `IntegTestUtil` (Cognito, DynamoDB).
|
|
42
|
+
- Adding a new HTTP abstraction layer. `fetch` is the abstraction.
|
|
43
|
+
- Changing the JWT verification flow itself (token discovery, JWKS caching
|
|
44
|
+
behavior, claims shape).
|
|
45
|
+
|
|
46
|
+
## Current Usage
|
|
47
|
+
|
|
48
|
+
`axios` is imported from exactly two source files:
|
|
49
|
+
|
|
50
|
+
### 1. `src/lambda/auth.ts` — runtime (ships in Lambda bundles)
|
|
51
|
+
|
|
52
|
+
```ts
|
|
53
|
+
import Axios from 'axios';
|
|
54
|
+
// ...
|
|
55
|
+
const publicKeys: PublicKeys =
|
|
56
|
+
(await Axios.get<PublicKeys>(jwksUrl)).data; // line 47
|
|
57
|
+
// ...
|
|
58
|
+
const issuerMetadata =
|
|
59
|
+
(await Axios.get<IssuerMetadata>(wellKnownUri)).data; // line 65
|
|
60
|
+
```
|
|
61
|
+
|
|
62
|
+
Both calls are plain GETs against well-known JSON endpoints (the issuer's
|
|
63
|
+
`/.well-known` discovery document and the JWKS URL). Response is parsed as
|
|
64
|
+
JSON. No retry, no interceptors, no custom transports — trivially mappable
|
|
65
|
+
to `fetch(url).then(r => r.json())`.
|
|
66
|
+
|
|
67
|
+
### 2. `src/tests/integ-test-util.ts` — test utility (consumer-facing API)
|
|
68
|
+
|
|
69
|
+
```ts
|
|
70
|
+
import { Axios, AxiosRequestConfig, HttpStatusCode } from 'axios';
|
|
71
|
+
|
|
72
|
+
public getClient(config?: AxiosRequestConfig) { return new Axios({...}); } // line 78
|
|
73
|
+
public async getAuthenticatedClient(email, password?, config?) { ... } // line 99
|
|
74
|
+
protected async loginUser(email, password) {
|
|
75
|
+
const cognitoClient = new Axios({ baseURL: '...' }); // line 204
|
|
76
|
+
const auth = await cognitoClient.post('/', JSON.stringify({...}), {...});
|
|
77
|
+
}
|
|
78
|
+
```
|
|
79
|
+
|
|
80
|
+
This file is exported via `src/tests/index.ts` and is part of the **public
|
|
81
|
+
API** of `cdk-serverless/tests`. `getClient()` and `getAuthenticatedClient()`
|
|
82
|
+
both **return an `Axios` instance** and accept an `AxiosRequestConfig`.
|
|
83
|
+
Consumers writing integration tests call `.get()` / `.post()` etc. on the
|
|
84
|
+
returned client.
|
|
85
|
+
|
|
86
|
+
## Proposed Changes
|
|
87
|
+
|
|
88
|
+
### Phase 1 — `src/lambda/auth.ts` (no breaking change)
|
|
89
|
+
|
|
90
|
+
Replace the two `Axios.get` calls with `fetch`. The function signatures and
|
|
91
|
+
exported types in `auth.ts` do not expose axios, so this is a pure internal
|
|
92
|
+
refactor.
|
|
93
|
+
|
|
94
|
+
```ts
|
|
95
|
+
const getPublicKeys = async (jwksUrl: string): Promise<MapOfKidToPublicKey> => {
|
|
96
|
+
if (!cacheKeys) {
|
|
97
|
+
const res = await fetch(jwksUrl);
|
|
98
|
+
if (!res.ok) throw new Error(`JWKS fetch failed: ${res.status}`);
|
|
99
|
+
const publicKeys = (await res.json()) as PublicKeys;
|
|
100
|
+
cacheKeys = publicKeys.keys.reduce(/* ... unchanged ... */);
|
|
101
|
+
}
|
|
102
|
+
return cacheKeys;
|
|
103
|
+
};
|
|
104
|
+
|
|
105
|
+
const getJwksUri = async (discoveryUri: string, jwksUri?: string): Promise<string> => {
|
|
106
|
+
if (jwksUri) return jwksUri;
|
|
107
|
+
const res = await fetch(`${discoveryUri}/.well-known`);
|
|
108
|
+
if (!res.ok) throw new Error(`Issuer metadata fetch failed: ${res.status}`);
|
|
109
|
+
const issuerMetadata = (await res.json()) as IssuerMetadata;
|
|
110
|
+
if (!issuerMetadata.jwks_uri) throw new Error('Issuer does not offer JWKS endpoint');
|
|
111
|
+
return issuerMetadata.jwks_uri;
|
|
112
|
+
};
|
|
113
|
+
```
|
|
114
|
+
|
|
115
|
+
Behavior delta vs. axios:
|
|
116
|
+
- axios throws on non-2xx by default; `fetch` does not. We add an explicit
|
|
117
|
+
`if (!res.ok)` check at each call site to preserve the prior behavior.
|
|
118
|
+
- axios JSON-parses based on response `Content-Type`; we call `res.json()`
|
|
119
|
+
explicitly. The two endpoints (JWKS, well-known) are spec-defined to
|
|
120
|
+
return JSON.
|
|
121
|
+
- Error shape changes (no `AxiosError`). Callers in this file already wrap
|
|
122
|
+
with try/catch and log via `lambda-log`, so the visible behavior is the
|
|
123
|
+
same.
|
|
124
|
+
|
|
125
|
+
### Phase 2 — `src/tests/integ-test-util.ts` (breaking change for tests/integ consumers)
|
|
126
|
+
|
|
127
|
+
Two options, choose one before implementation:
|
|
128
|
+
|
|
129
|
+
**Option A — Replace return type with a thin `fetch`-based client (breaking).**
|
|
130
|
+
Introduce a small internal `HttpClient` class with the methods consumers
|
|
131
|
+
actually use (`get`, `post`, optional `put`/`delete`/`patch`), backed by
|
|
132
|
+
`fetch`. Update the exported signatures:
|
|
133
|
+
|
|
134
|
+
```ts
|
|
135
|
+
public getClient(config?: HttpClientConfig): HttpClient { ... }
|
|
136
|
+
public async getAuthenticatedClient(email, password?, config?): Promise<HttpClient> { ... }
|
|
137
|
+
```
|
|
138
|
+
|
|
139
|
+
`HttpClientConfig` covers the fields actually used today: `baseURL`,
|
|
140
|
+
`headers`, `transformRequest`, `transformResponse`. The `loginUser` flow
|
|
141
|
+
is rewritten internally to call `fetch` directly against the Cognito
|
|
142
|
+
endpoint.
|
|
143
|
+
|
|
144
|
+
This is the cleanest end state. It is a breaking change for anyone
|
|
145
|
+
chaining axios-specific methods (`interceptors`, `defaults`, etc.) on
|
|
146
|
+
the returned client — but the existing public surface in this repo only
|
|
147
|
+
uses `.get`/`.post` with `baseURL` and headers.
|
|
148
|
+
|
|
149
|
+
**Option B — Keep axios in `IntegTestUtil`, move to `devDependencies`/`peerDependencies`.**
|
|
150
|
+
Remove axios only from `auth.ts`. Move axios from `dependencies` to
|
|
151
|
+
`peerDependencies` (optional) in `package.json` so it is no longer pulled
|
|
152
|
+
in transitively by consumers who only use the Lambda runtime helpers.
|
|
153
|
+
Consumers who use `cdk-serverless/tests` add `axios` to their own
|
|
154
|
+
`devDependencies` (standard for test utilities).
|
|
155
|
+
|
|
156
|
+
This is **lower risk** and still removes axios from production Lambda
|
|
157
|
+
bundles, but leaves an axios dep in the picture for test consumers.
|
|
158
|
+
|
|
159
|
+
**Recommendation: Option A.** The public surface of the integ-test client
|
|
160
|
+
is small, the migration is mechanical (replace `client.get('/x').then(r => r.data)`
|
|
161
|
+
with `client.get('/x').then(r => r.json())`), and the end state — zero
|
|
162
|
+
axios — is clean. Bundle as a `feat!`/major in the next breaking release.
|
|
163
|
+
|
|
164
|
+
### Phase 3 — Cleanup
|
|
165
|
+
|
|
166
|
+
- Remove `axios` from `dependencies` in `package.json`.
|
|
167
|
+
- Remove `'axios'` from `deps` in `.projenrc.ts:20`.
|
|
168
|
+
- Run `npx projen` to regenerate `package.json` and lockfile.
|
|
169
|
+
- Verify no transitive axios in the produced Lambda bundles via
|
|
170
|
+
`esbuild --analyze` or `npm ls axios` showing empty.
|
|
171
|
+
|
|
172
|
+
## API Impact
|
|
173
|
+
|
|
174
|
+
| Symbol | Before | After (Option A) | Breaking? |
|
|
175
|
+
|---|---|---|---|
|
|
176
|
+
| `auth.ApiGatewayv1JwtAuthorizer` and friends | — | — | No (internal only) |
|
|
177
|
+
| `tests.IntegTestUtil#getClient` | returns `Axios` | returns `HttpClient` | **Yes** |
|
|
178
|
+
| `tests.IntegTestUtil#getAuthenticatedClient` | returns `Promise<Axios>` | returns `Promise<HttpClient>` | **Yes** |
|
|
179
|
+
| `tests.IntegTestUtil#getClient(config)` | `AxiosRequestConfig` | `HttpClientConfig` (subset) | **Yes** |
|
|
180
|
+
|
|
181
|
+
Migration note for consumers of `IntegTestUtil`:
|
|
182
|
+
- `client.get(path).then(r => r.data)` → `client.get(path).then(r => r.json())`
|
|
183
|
+
- `client.post(path, JSON.stringify(body), { headers })` → same shape, but
|
|
184
|
+
the response shape differs (no `.data`, no `.status` — use `.ok`, `.status`,
|
|
185
|
+
`.json()`).
|
|
186
|
+
|
|
187
|
+
## Testing
|
|
188
|
+
|
|
189
|
+
1. **Unit tests** — exercise `auth.ts` against a local HTTP server that
|
|
190
|
+
serves a mock `/.well-known` document and JWKS. Confirm:
|
|
191
|
+
- Successful key fetch and PEM conversion (cache populated once).
|
|
192
|
+
- 5xx from JWKS endpoint surfaces as an error (existing behavior).
|
|
193
|
+
- Missing `jwks_uri` in metadata throws.
|
|
194
|
+
2. **Lambda test utilities** — update existing `lambda-test-utils.ts` tests
|
|
195
|
+
if any depend on the axios import path (none today, but verify).
|
|
196
|
+
3. **Integ tests** — re-run any integ test in this repo that uses
|
|
197
|
+
`IntegTestUtil` against a real Cognito user pool to confirm
|
|
198
|
+
`getClient`/`getAuthenticatedClient`/`loginUser` paths work with the
|
|
199
|
+
new client.
|
|
200
|
+
4. **Bundle size check** — run `esbuild` over `src/lambda/handler.ts` before
|
|
201
|
+
and after to record the delta. Include the number in the PR description.
|
|
202
|
+
|
|
203
|
+
## Alternatives Considered
|
|
204
|
+
|
|
205
|
+
1. **`node-fetch` or `undici` directly.** `node-fetch` is a polyfill we
|
|
206
|
+
don't need; `undici` is what `fetch` is built on, but using it directly
|
|
207
|
+
adds a runtime dep without benefit. Native `fetch` is the right call.
|
|
208
|
+
2. **Keep axios, pin tighter, add interceptors for fetch-like ergonomics.**
|
|
209
|
+
Doesn't address bundle size or supply-chain motivations.
|
|
210
|
+
3. **Vendor a tiny `http`/`https` wrapper.** Works on older Node, but the
|
|
211
|
+
minimum supported runtime here (`NODEJS_LATEST`) makes `fetch` strictly
|
|
212
|
+
better.
|
|
213
|
+
|
|
214
|
+
## Rollout
|
|
215
|
+
|
|
216
|
+
1. Land Phase 1 (`auth.ts` only) as a non-breaking `chore:` or `refactor:`
|
|
217
|
+
commit. This already removes axios from the **Lambda runtime** code path
|
|
218
|
+
even before the API is changed.
|
|
219
|
+
2. Land Phase 2 (`IntegTestUtil`) as a `feat!:` commit gated to a major
|
|
220
|
+
bump. Document the migration in the release notes / CHANGELOG.
|
|
221
|
+
3. Land Phase 3 (`package.json` / `.projenrc.ts` cleanup) together with
|
|
222
|
+
Phase 2.
|
|
223
|
+
|
|
224
|
+
If we choose Option B instead, Phase 2 becomes a `chore:` (move axios to
|
|
225
|
+
peerDependencies, document in README) and there is no major bump.
|
|
226
|
+
|
|
227
|
+
## Open Questions
|
|
228
|
+
|
|
229
|
+
1. **Option A vs. Option B** — accept a breaking change in `IntegTestUtil`,
|
|
230
|
+
or keep axios there and just move it to `peerDependencies`? (Recommendation
|
|
231
|
+
above is A.)
|
|
232
|
+
2. **Cache invalidation on fetch failure** — should we clear `cacheKeys` if
|
|
233
|
+
a JWKS rotation makes a previously-cached `kid` invalid? Out of scope for
|
|
234
|
+
this spec, but worth filing as a follow-up if not already tracked.
|
|
235
|
+
3. **Timeout behavior** — `fetch` has no default timeout. Should we wrap
|
|
236
|
+
the JWKS/well-known fetches with `AbortSignal.timeout(5000)`? axios also
|
|
237
|
+
had no default timeout in our usage, so behavior parity is preserved
|
|
238
|
+
without it — but adding one is cheap and prevents a hang on a dead JWKS
|
|
239
|
+
host from blocking a cold start. Recommendation: add
|
|
240
|
+
`AbortSignal.timeout(5000)`.
|