@cdk8s/awscdk-resolver 0.0.655 → 0.0.656

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/.jsii CHANGED
@@ -7,7 +7,7 @@
7
7
  "url": "https://aws.amazon.com"
8
8
  },
9
9
  "bundled": {
10
- "@aws-sdk/client-cloudformation": "^3.1109.0"
10
+ "@aws-sdk/client-cloudformation": "^3.1110.0"
11
11
  },
12
12
  "dependencies": {
13
13
  "aws-cdk-lib": "^2.195.0",
@@ -4083,6 +4083,6 @@
4083
4083
  "symbolId": "src/resolve:AwsCdkResolver"
4084
4084
  }
4085
4085
  },
4086
- "version": "0.0.655",
4087
- "fingerprint": "JoW4NiRkfF//wJfnWXMnle9Pm2Hgb3V5cPek+a/Wpxs="
4086
+ "version": "0.0.656",
4087
+ "fingerprint": "PJgGLH5BkyyJBwxqiPdR2ZXEko2xm2CIAh9ks00aya8="
4088
4088
  }
package/lib/resolve.js CHANGED
@@ -39,7 +39,7 @@ const child_process_1 = require("child_process");
39
39
  const path = __importStar(require("path"));
40
40
  const aws_cdk_lib_1 = require("aws-cdk-lib");
41
41
  class AwsCdkResolver {
42
- static [JSII_RTTI_SYMBOL_1] = { fqn: "@cdk8s/awscdk-resolver.AwsCdkResolver", version: "0.0.655" };
42
+ static [JSII_RTTI_SYMBOL_1] = { fqn: "@cdk8s/awscdk-resolver.AwsCdkResolver", version: "0.0.656" };
43
43
  resolve(context) {
44
44
  if (!aws_cdk_lib_1.Token.isUnresolved(context.value)) {
45
45
  return;
@@ -69,7 +69,7 @@ const commonParams = {
69
69
  UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
70
70
  };
71
71
 
72
- var version = "3.1108.0";
72
+ var version = "3.1109.0";
73
73
  var packageInfo = {
74
74
  version: version};
75
75
 
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/client-cloudformation",
3
- "version": "3.1109.0",
3
+ "version": "3.1110.0",
4
4
  "description": "AWS SDK for JavaScript Cloudformation Client for Node.js, Browser and React Native",
5
5
  "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/clients/client-cloudformation",
6
6
  "license": "Apache-2.0",
@@ -928,24 +928,27 @@ class Fields {
928
928
  }
929
929
 
930
930
  const getHttpHandlerExtensionConfiguration = (runtimeConfig) => {
931
+ if (runtimeConfig.logger && runtimeConfig.logger.constructor?.name !== "NoOpLogger") {
932
+ runtimeConfig.requestHandler?.updateHttpClientConfig?.(Symbol.for("logger"), runtimeConfig.logger);
933
+ }
931
934
  return {
932
935
  setHttpHandler(handler) {
933
- runtimeConfig.httpHandler = handler;
936
+ runtimeConfig.requestHandler = handler;
934
937
  },
935
938
  httpHandler() {
936
- return runtimeConfig.httpHandler;
939
+ return runtimeConfig.requestHandler;
937
940
  },
938
941
  updateHttpClientConfig(key, value) {
939
- runtimeConfig.httpHandler?.updateHttpClientConfig(key, value);
942
+ runtimeConfig.requestHandler?.updateHttpClientConfig(key, value);
940
943
  },
941
944
  httpHandlerConfigs() {
942
- return runtimeConfig.httpHandler.httpHandlerConfigs();
945
+ return runtimeConfig.requestHandler.httpHandlerConfigs();
943
946
  },
944
947
  };
945
948
  };
946
949
  const resolveHttpHandlerRuntimeConfig = (httpHandlerExtensionConfiguration) => {
947
950
  return {
948
- httpHandler: httpHandlerExtensionConfiguration.httpHandler(),
951
+ requestHandler: httpHandlerExtensionConfiguration.httpHandler(),
949
952
  };
950
953
  };
951
954
 
@@ -1,21 +1,24 @@
1
1
  export const getHttpHandlerExtensionConfiguration = (runtimeConfig) => {
2
+ if (runtimeConfig.logger && runtimeConfig.logger.constructor?.name !== "NoOpLogger") {
3
+ runtimeConfig.requestHandler?.updateHttpClientConfig?.(Symbol.for("logger"), runtimeConfig.logger);
4
+ }
2
5
  return {
3
6
  setHttpHandler(handler) {
4
- runtimeConfig.httpHandler = handler;
7
+ runtimeConfig.requestHandler = handler;
5
8
  },
6
9
  httpHandler() {
7
- return runtimeConfig.httpHandler;
10
+ return runtimeConfig.requestHandler;
8
11
  },
9
12
  updateHttpClientConfig(key, value) {
10
- runtimeConfig.httpHandler?.updateHttpClientConfig(key, value);
13
+ runtimeConfig.requestHandler?.updateHttpClientConfig(key, value);
11
14
  },
12
15
  httpHandlerConfigs() {
13
- return runtimeConfig.httpHandler.httpHandlerConfigs();
16
+ return runtimeConfig.requestHandler.httpHandlerConfigs();
14
17
  },
15
18
  };
16
19
  };
17
20
  export const resolveHttpHandlerRuntimeConfig = (httpHandlerExtensionConfiguration) => {
18
21
  return {
19
- httpHandler: httpHandlerExtensionConfiguration.httpHandler(),
22
+ requestHandler: httpHandlerExtensionConfiguration.httpHandler(),
20
23
  };
21
24
  };
@@ -1,3 +1,4 @@
1
+ import type { Logger } from "@smithy/types";
1
2
  import type { HttpHandler } from "../httpHandler";
2
3
  /**
3
4
  * @internal
@@ -12,14 +13,18 @@ export interface HttpHandlerExtensionConfiguration<HandlerConfig extends object
12
13
  * @internal
13
14
  */
14
15
  export type HttpHandlerExtensionConfigType<HandlerConfig extends object = {}> = Partial<{
15
- httpHandler: HttpHandler<HandlerConfig>;
16
+ requestHandler: HttpHandler<HandlerConfig>;
16
17
  }>;
17
18
  /**
18
19
  * Helper function to resolve default extension configuration from runtime config
19
20
  *
20
21
  * @internal
21
22
  */
22
- export declare const getHttpHandlerExtensionConfiguration: <HandlerConfig extends object = {}>(runtimeConfig: HttpHandlerExtensionConfigType<HandlerConfig>) => {
23
+ export declare const getHttpHandlerExtensionConfiguration: <HandlerConfig extends {
24
+ logger?: Logger;
25
+ }>(runtimeConfig: HttpHandlerExtensionConfigType<HandlerConfig> & {
26
+ logger?: Logger;
27
+ }) => {
23
28
  setHttpHandler(handler: HttpHandler<HandlerConfig>): void;
24
29
  httpHandler(): HttpHandler<HandlerConfig>;
25
30
  updateHttpClientConfig(key: keyof HandlerConfig, value: HandlerConfig[typeof key]): void;
@@ -1,3 +1,4 @@
1
+ import { Logger } from "@smithy/types";
1
2
  import { HttpHandler } from "../httpHandler";
2
3
  /**
3
4
  * @internal
@@ -12,14 +13,18 @@ export interface HttpHandlerExtensionConfiguration<HandlerConfig extends object
12
13
  * @internal
13
14
  */
14
15
  export type HttpHandlerExtensionConfigType<HandlerConfig extends object = {}> = Partial<{
15
- httpHandler: HttpHandler<HandlerConfig>;
16
+ requestHandler: HttpHandler<HandlerConfig>;
16
17
  }>;
17
18
  /**
18
19
  * Helper function to resolve default extension configuration from runtime config
19
20
  *
20
21
  * @internal
21
22
  */
22
- export declare const getHttpHandlerExtensionConfiguration: <HandlerConfig extends object = {}>(runtimeConfig: HttpHandlerExtensionConfigType<HandlerConfig>) => {
23
+ export declare const getHttpHandlerExtensionConfiguration: <HandlerConfig extends {
24
+ logger?: Logger;
25
+ }>(runtimeConfig: HttpHandlerExtensionConfigType<HandlerConfig> & {
26
+ logger?: Logger;
27
+ }) => {
23
28
  setHttpHandler(handler: HttpHandler<HandlerConfig>): void;
24
29
  httpHandler(): HttpHandler<HandlerConfig>;
25
30
  updateHttpClientConfig(key: keyof HandlerConfig, value: HandlerConfig[typeof key]): void;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@smithy/core",
3
- "version": "3.32.0",
3
+ "version": "3.33.0",
4
4
  "homepage": "https://github.com/smithy-lang/smithy-typescript/tree/main/packages/core",
5
5
  "license": "Apache-2.0",
6
6
  "author": {
@@ -214,9 +214,6 @@
214
214
  "require": "./dist-cjs/submodules/transport/index.js"
215
215
  }
216
216
  },
217
- "publishConfig": {
218
- "directory": ".release/package"
219
- },
220
217
  "scripts": {
221
218
  "benchmark:cbor": "node ./scripts/cbor-perf.mjs",
222
219
  "benchmark:checksum": "node ./scripts/checksum-perf.mjs",
@@ -229,7 +226,6 @@
229
226
  "extract:docs": "api-extractor run --local",
230
227
  "lint": "node ../../scripts/validation/submodules-linter.js",
231
228
  "prebuild": "yarn lint",
232
- "stage-release": "premove .release && yarn pack && mkdir ./.release && tar zxvf ./package.tgz --directory ./.release && rm ./package.tgz",
233
229
  "test": "yarn g:vitest run",
234
230
  "test:watch": "yarn g:vitest watch",
235
231
  "test:integration": "yarn g:vitest run -c vitest.config.integ.mts",
@@ -266,6 +266,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
266
266
  this.config = await this.configProvider;
267
267
  }
268
268
  const config = this.config;
269
+ const logger = config.logger;
269
270
  const isSSL = request.protocol === "https:";
270
271
  if (!isSSL && !this.config.httpAgent) {
271
272
  this.config.httpAgent = await this.config.httpAgentProvider();
@@ -309,7 +310,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
309
310
  });
310
311
  }
311
312
  socketWarningTimeoutId = timing.setTimeout(() => {
312
- this.socketWarningTimestamp = NodeHttpHandler.checkSocketUsage(agent, this.socketWarningTimestamp, config.logger);
313
+ this.socketWarningTimestamp = NodeHttpHandler.checkSocketUsage(agent, this.socketWarningTimestamp, logger);
313
314
  }, config.socketAcquisitionWarningTimeout ?? (config.requestTimeout ?? 2000) + (config.connectionTimeout ?? 1000));
314
315
  const queryString = request.query ? buildQueryString(request.query) : "";
315
316
  let auth = undefined;
@@ -376,7 +377,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
376
377
  }
377
378
  const effectiveRequestTimeout = requestTimeout ?? config.requestTimeout;
378
379
  connectionTimeoutId = setConnectionTimeout(req, reject, config.connectionTimeout);
379
- requestTimeoutId = setRequestTimeout(req, reject, effectiveRequestTimeout, config.throwOnRequestTimeout, config.logger ?? console);
380
+ requestTimeoutId = setRequestTimeout(req, reject, effectiveRequestTimeout, config.throwOnRequestTimeout, logger ?? console);
380
381
  socketTimeoutId = setSocketTimeout(req, reject, config.socketTimeout);
381
382
  const httpAgent = nodeHttpsOptions.agent;
382
383
  if (typeof httpAgent === "object" && "keepAlive" in httpAgent) {
@@ -394,6 +395,12 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
394
395
  updateHttpClientConfig(key, value) {
395
396
  this.config = undefined;
396
397
  this.configProvider = this.configProvider.then((config) => {
398
+ if (key === Symbol.for("logger")) {
399
+ return {
400
+ ...config,
401
+ logger: config.logger ?? value,
402
+ };
403
+ }
397
404
  return {
398
405
  ...config,
399
406
  [key]: value,
@@ -70,6 +70,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
70
70
  this.config = await this.configProvider;
71
71
  }
72
72
  const config = this.config;
73
+ const logger = config.logger;
73
74
  const isSSL = request.protocol === "https:";
74
75
  if (!isSSL && !this.config.httpAgent) {
75
76
  this.config.httpAgent = await this.config.httpAgentProvider();
@@ -113,7 +114,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
113
114
  });
114
115
  }
115
116
  socketWarningTimeoutId = timing.setTimeout(() => {
116
- this.socketWarningTimestamp = NodeHttpHandler.checkSocketUsage(agent, this.socketWarningTimestamp, config.logger);
117
+ this.socketWarningTimestamp = NodeHttpHandler.checkSocketUsage(agent, this.socketWarningTimestamp, logger);
117
118
  }, config.socketAcquisitionWarningTimeout ?? (config.requestTimeout ?? 2000) + (config.connectionTimeout ?? 1000));
118
119
  const queryString = request.query ? buildQueryString(request.query) : "";
119
120
  let auth = undefined;
@@ -180,7 +181,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
180
181
  }
181
182
  const effectiveRequestTimeout = requestTimeout ?? config.requestTimeout;
182
183
  connectionTimeoutId = setConnectionTimeout(req, reject, config.connectionTimeout);
183
- requestTimeoutId = setRequestTimeout(req, reject, effectiveRequestTimeout, config.throwOnRequestTimeout, config.logger ?? console);
184
+ requestTimeoutId = setRequestTimeout(req, reject, effectiveRequestTimeout, config.throwOnRequestTimeout, logger ?? console);
184
185
  socketTimeoutId = setSocketTimeout(req, reject, config.socketTimeout);
185
186
  const httpAgent = nodeHttpsOptions.agent;
186
187
  if (typeof httpAgent === "object" && "keepAlive" in httpAgent) {
@@ -198,6 +199,12 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
198
199
  updateHttpClientConfig(key, value) {
199
200
  this.config = undefined;
200
201
  this.configProvider = this.configProvider.then((config) => {
202
+ if (key === Symbol.for("logger")) {
203
+ return {
204
+ ...config,
205
+ logger: config.logger ?? value,
206
+ };
207
+ }
201
208
  return {
202
209
  ...config,
203
210
  [key]: value,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@smithy/node-http-handler",
3
- "version": "4.10.0",
3
+ "version": "4.11.0",
4
4
  "description": "Provides a way to make requests",
5
5
  "homepage": "https://github.com/smithy-lang/smithy-typescript/tree/main/packages/node-http-handler",
6
6
  "license": "Apache-2.0",
@@ -28,9 +28,6 @@
28
28
  ]
29
29
  }
30
30
  },
31
- "publishConfig": {
32
- "directory": ".release/package"
33
- },
34
31
  "scripts": {
35
32
  "build": "concurrently 'yarn:build:types' 'yarn:build:es:cjs'",
36
33
  "build:es:cjs": "node ../../scripts/compilation/es_cjs.js",
@@ -38,12 +35,11 @@
38
35
  "build:types:downlevel": "premove dist-types/ts3.4 && downlevel-dts dist-types dist-types/ts3.4",
39
36
  "clean": "premove dist-cjs dist-es dist-types",
40
37
  "extract:docs": "api-extractor run --local",
41
- "stage-release": "premove .release && yarn pack && mkdir ./.release && tar zxvf ./package.tgz --directory ./.release && rm ./package.tgz",
42
38
  "test": "yarn g:vitest run",
43
39
  "test:watch": "yarn g:vitest watch"
44
40
  },
45
41
  "dependencies": {
46
- "@smithy/core": "^3.32.0",
42
+ "@smithy/core": "^3.33.0",
47
43
  "@smithy/types": "^4.17.0",
48
44
  "tslib": "^2.6.2"
49
45
  },
package/package.json CHANGED
@@ -43,17 +43,17 @@
43
43
  "organization": false
44
44
  },
45
45
  "devDependencies": {
46
- "@cdk8s/projen-common": "0.1.17",
46
+ "@cdk8s/projen-common": "0.1.18",
47
47
  "@stylistic/eslint-plugin": "^2",
48
48
  "@types/fs-extra": "^11.0.4",
49
49
  "@types/jest": "^27",
50
50
  "@types/node": "^18",
51
51
  "@typescript-eslint/eslint-plugin": "^8",
52
52
  "@typescript-eslint/parser": "^8",
53
- "aws-cdk": "^2.1135.1",
53
+ "aws-cdk": "^2.1136.0",
54
54
  "aws-cdk-lib": "2.195.0",
55
55
  "cdk8s": "2.68.91",
56
- "cdk8s-cli": "^2.207.49",
56
+ "cdk8s-cli": "^2.207.50",
57
57
  "commit-and-tag-version": "^12",
58
58
  "constructs": "10.3.0",
59
59
  "eslint": "^9",
@@ -78,7 +78,7 @@
78
78
  "constructs": "^10.3.0"
79
79
  },
80
80
  "dependencies": {
81
- "@aws-sdk/client-cloudformation": "^3.1109.0"
81
+ "@aws-sdk/client-cloudformation": "^3.1110.0"
82
82
  },
83
83
  "bundledDependencies": [
84
84
  "@aws-sdk/client-cloudformation"
@@ -92,7 +92,7 @@
92
92
  "publishConfig": {
93
93
  "access": "public"
94
94
  },
95
- "version": "0.0.655",
95
+ "version": "0.0.656",
96
96
  "jest": {
97
97
  "coverageProvider": "v8",
98
98
  "testMatch": [