Skip to content

Commit 3c4e6d7

Browse files
trivikrtrivikr
authored
chore: update smithy-typescript commit to include request compression (#5643)
1 parent 3b0b0c6 commit 3c4e6d7

32 files changed

+217
-37
lines changed

‎private/aws-protocoltests-ec2/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"@smithy/fetch-http-handler": "^2.3.2",
3333
"@smithy/hash-node": "^2.0.18",
3434
"@smithy/invalid-dependency": "^2.0.16",
35+
"@smithy/middleware-compression": "^2.0.2",
3536
"@smithy/middleware-content-length": "^2.0.18",
3637
"@smithy/middleware-retry": "^2.0.26",
3738
"@smithy/middleware-serde": "^2.0.16",

‎private/aws-protocoltests-ec2/src/EC2ProtocolClient.ts‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ import {
2121
resolveEndpointsConfig,
2222
resolveRegionConfig,
2323
} from "@smithy/config-resolver";
24+
import {
25+
CompressionInputConfig,
26+
CompressionResolvedConfig,
27+
resolveCompressionConfig,
28+
} from "@smithy/middleware-compression";
2429
import { getContentLengthPlugin } from "@smithy/middleware-content-length";
2530
import { getRetryPlugin, resolveRetryConfig, RetryInputConfig, RetryResolvedConfig } from "@smithy/middleware-retry";
2631
import { HttpHandler as __HttpHandler } from "@smithy/protocol-http";
@@ -293,7 +298,8 @@ export type EC2ProtocolClientConfigType = Partial<__SmithyConfiguration<__HttpHa
293298
EndpointsInputConfig &
294299
RetryInputConfig &
295300
HostHeaderInputConfig &
296-
UserAgentInputConfig;
301+
UserAgentInputConfig &
302+
CompressionInputConfig;
297303
/**
298304
* @public
299305
*
@@ -311,7 +317,8 @@ export type EC2ProtocolClientResolvedConfigType = __SmithyResolvedConfiguration<
311317
EndpointsResolvedConfig &
312318
RetryResolvedConfig &
313319
HostHeaderResolvedConfig &
314-
UserAgentResolvedConfig;
320+
UserAgentResolvedConfig &
321+
CompressionResolvedConfig;
315322
/**
316323
* @public
317324
*
@@ -341,9 +348,10 @@ export class EC2ProtocolClient extends __Client<
341348
const _config_3 = resolveRetryConfig(_config_2);
342349
const _config_4 = resolveHostHeaderConfig(_config_3);
343350
const _config_5 = resolveUserAgentConfig(_config_4);
344-
const _config_6 = resolveRuntimeExtensions(_config_5, configuration?.extensions || []);
345-
super(_config_6);
346-
this.config = _config_6;
351+
const _config_6 = resolveCompressionConfig(_config_5);
352+
const _config_7 = resolveRuntimeExtensions(_config_6, configuration?.extensions || []);
353+
super(_config_7);
354+
this.config = _config_7;
347355
this.middlewareStack.use(getRetryPlugin(this.config));
348356
this.middlewareStack.use(getContentLengthPlugin(this.config));
349357
this.middlewareStack.use(getHostHeaderPlugin(this.config));

‎private/aws-protocoltests-ec2/src/commands/PutWithContentEncodingCommand.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// smithy-typescript generated code
2+
import { getCompressionPlugin } from "@smithy/middleware-compression";
23
import { getSerdePlugin } from "@smithy/middleware-serde";
34
import { Command as $Command } from "@smithy/smithy-client";
45
import { MetadataBearer as __MetadataBearer } from "@smithy/types";
@@ -62,7 +63,10 @@ export class PutWithContentEncodingCommand extends $Command
6263
ServiceOutputTypes
6364
>()
6465
.m(function (this: any, Command: any, cs: any, config: EC2ProtocolClientResolvedConfig, o: any) {
65-
return [getSerdePlugin(config, this.serialize, this.deserialize)];
66+
return [
67+
getSerdePlugin(config, this.serialize, this.deserialize),
68+
getCompressionPlugin(config, { encodings: ["gzip"] }),
69+
];
6670
})
6771
.s("AwsEc2", "PutWithContentEncoding", {})
6872
.n("EC2ProtocolClient", "PutWithContentEncodingCommand")

‎private/aws-protocoltests-ec2/src/runtimeConfig.browser.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import { Sha256 } from "@aws-crypto/sha256-browser";
66
import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
77
import { DEFAULT_USE_DUALSTACK_ENDPOINT, DEFAULT_USE_FIPS_ENDPOINT } from "@smithy/config-resolver";
88
import { FetchHttpHandler as RequestHandler, streamCollector } from "@smithy/fetch-http-handler";
9+
import {
10+
DEFAULT_DISABLE_REQUEST_COMPRESSION,
11+
DEFAULT_NODE_REQUEST_MIN_COMPRESSION_SIZE_BYTES,
12+
} from "@smithy/middleware-compression";
913
import { calculateBodyLength } from "@smithy/util-body-length-browser";
1014
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@smithy/util-retry";
1115
import { EC2ProtocolClientConfig } from "./EC2ProtocolClient";
@@ -29,8 +33,11 @@ export const getRuntimeConfig = (config: EC2ProtocolClientConfig) => {
2933
defaultUserAgentProvider:
3034
config?.defaultUserAgentProvider ??
3135
defaultUserAgent({ serviceId: clientSharedValues.serviceId, clientVersion: packageInfo.version }),
36+
disableRequestCompression: config?.disableRequestCompression ?? DEFAULT_DISABLE_REQUEST_COMPRESSION,
3237
maxAttempts: config?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
3338
requestHandler: config?.requestHandler ?? new RequestHandler(defaultConfigProvider),
39+
requestMinCompressionSizeBytes:
40+
config?.requestMinCompressionSizeBytes ?? DEFAULT_NODE_REQUEST_MIN_COMPRESSION_SIZE_BYTES,
3441
retryMode: config?.retryMode ?? (async () => (await defaultConfigProvider()).retryMode || DEFAULT_RETRY_MODE),
3542
sha256: config?.sha256 ?? Sha256,
3643
streamCollector: config?.streamCollector ?? streamCollector,

‎private/aws-protocoltests-ec2/src/runtimeConfig.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import {
99
NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS,
1010
} from "@smithy/config-resolver";
1111
import { Hash } from "@smithy/hash-node";
12+
import {
13+
NODE_DISABLE_REQUEST_COMPRESSION_CONFIG_OPTIONS,
14+
NODE_REQUEST_MIN_COMPRESSION_SIZE_BYTES_CONFIG_OPTIONS,
15+
} from "@smithy/middleware-compression";
1216
import { NODE_MAX_ATTEMPT_CONFIG_OPTIONS, NODE_RETRY_MODE_CONFIG_OPTIONS } from "@smithy/middleware-retry";
1317
import { loadConfig as loadNodeConfig } from "@smithy/node-config-provider";
1418
import { NodeHttpHandler as RequestHandler, streamCollector } from "@smithy/node-http-handler";
@@ -38,8 +42,12 @@ export const getRuntimeConfig = (config: EC2ProtocolClientConfig) => {
3842
defaultUserAgentProvider:
3943
config?.defaultUserAgentProvider ??
4044
defaultUserAgent({ serviceId: clientSharedValues.serviceId, clientVersion: packageInfo.version }),
45+
disableRequestCompression:
46+
config?.disableRequestCompression ?? loadNodeConfig(NODE_DISABLE_REQUEST_COMPRESSION_CONFIG_OPTIONS),
4147
maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
4248
requestHandler: config?.requestHandler ?? new RequestHandler(defaultConfigProvider),
49+
requestMinCompressionSizeBytes:
50+
config?.requestMinCompressionSizeBytes ?? loadNodeConfig(NODE_REQUEST_MIN_COMPRESSION_SIZE_BYTES_CONFIG_OPTIONS),
4351
retryMode:
4452
config?.retryMode ??
4553
loadNodeConfig({

‎private/aws-protocoltests-json-10/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"@smithy/fetch-http-handler": "^2.3.2",
3333
"@smithy/hash-node": "^2.0.18",
3434
"@smithy/invalid-dependency": "^2.0.16",
35+
"@smithy/middleware-compression": "^2.0.2",
3536
"@smithy/middleware-content-length": "^2.0.18",
3637
"@smithy/middleware-retry": "^2.0.26",
3738
"@smithy/middleware-serde": "^2.0.16",

‎private/aws-protocoltests-json-10/src/JSONRPC10Client.ts‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ import {
2121
resolveEndpointsConfig,
2222
resolveRegionConfig,
2323
} from "@smithy/config-resolver";
24+
import {
25+
CompressionInputConfig,
26+
CompressionResolvedConfig,
27+
resolveCompressionConfig,
28+
} from "@smithy/middleware-compression";
2429
import { getContentLengthPlugin } from "@smithy/middleware-content-length";
2530
import { getRetryPlugin, resolveRetryConfig, RetryInputConfig, RetryResolvedConfig } from "@smithy/middleware-retry";
2631
import { HttpHandler as __HttpHandler } from "@smithy/protocol-http";
@@ -260,7 +265,8 @@ export type JSONRPC10ClientConfigType = Partial<__SmithyConfiguration<__HttpHand
260265
EndpointsInputConfig &
261266
RetryInputConfig &
262267
HostHeaderInputConfig &
263-
UserAgentInputConfig;
268+
UserAgentInputConfig &
269+
CompressionInputConfig;
264270
/**
265271
* @public
266272
*
@@ -278,7 +284,8 @@ export type JSONRPC10ClientResolvedConfigType = __SmithyResolvedConfiguration<__
278284
EndpointsResolvedConfig &
279285
RetryResolvedConfig &
280286
HostHeaderResolvedConfig &
281-
UserAgentResolvedConfig;
287+
UserAgentResolvedConfig &
288+
CompressionResolvedConfig;
282289
/**
283290
* @public
284291
*
@@ -307,9 +314,10 @@ export class JSONRPC10Client extends __Client<
307314
const _config_3 = resolveRetryConfig(_config_2);
308315
const _config_4 = resolveHostHeaderConfig(_config_3);
309316
const _config_5 = resolveUserAgentConfig(_config_4);
310-
const _config_6 = resolveRuntimeExtensions(_config_5, configuration?.extensions || []);
311-
super(_config_6);
312-
this.config = _config_6;
317+
const _config_6 = resolveCompressionConfig(_config_5);
318+
const _config_7 = resolveRuntimeExtensions(_config_6, configuration?.extensions || []);
319+
super(_config_7);
320+
this.config = _config_7;
313321
this.middlewareStack.use(getRetryPlugin(this.config));
314322
this.middlewareStack.use(getContentLengthPlugin(this.config));
315323
this.middlewareStack.use(getHostHeaderPlugin(this.config));

‎private/aws-protocoltests-json-10/src/commands/PutWithContentEncodingCommand.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// smithy-typescript generated code
2+
import { getCompressionPlugin } from "@smithy/middleware-compression";
23
import { getSerdePlugin } from "@smithy/middleware-serde";
34
import { Command as $Command } from "@smithy/smithy-client";
45
import { MetadataBearer as __MetadataBearer } from "@smithy/types";
@@ -62,7 +63,10 @@ export class PutWithContentEncodingCommand extends $Command
6263
ServiceOutputTypes
6364
>()
6465
.m(function (this: any, Command: any, cs: any, config: JSONRPC10ClientResolvedConfig, o: any) {
65-
return [getSerdePlugin(config, this.serialize, this.deserialize)];
66+
return [
67+
getSerdePlugin(config, this.serialize, this.deserialize),
68+
getCompressionPlugin(config, { encodings: ["gzip"] }),
69+
];
6670
})
6771
.s("JsonRpc10", "PutWithContentEncoding", {})
6872
.n("JSONRPC10Client", "PutWithContentEncodingCommand")

‎private/aws-protocoltests-json-10/src/runtimeConfig.browser.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import { Sha256 } from "@aws-crypto/sha256-browser";
66
import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
77
import { DEFAULT_USE_DUALSTACK_ENDPOINT, DEFAULT_USE_FIPS_ENDPOINT } from "@smithy/config-resolver";
88
import { FetchHttpHandler as RequestHandler, streamCollector } from "@smithy/fetch-http-handler";
9+
import {
10+
DEFAULT_DISABLE_REQUEST_COMPRESSION,
11+
DEFAULT_NODE_REQUEST_MIN_COMPRESSION_SIZE_BYTES,
12+
} from "@smithy/middleware-compression";
913
import { calculateBodyLength } from "@smithy/util-body-length-browser";
1014
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@smithy/util-retry";
1115
import { JSONRPC10ClientConfig } from "./JSONRPC10Client";
@@ -29,8 +33,11 @@ export const getRuntimeConfig = (config: JSONRPC10ClientConfig) => {
2933
defaultUserAgentProvider:
3034
config?.defaultUserAgentProvider ??
3135
defaultUserAgent({ serviceId: clientSharedValues.serviceId, clientVersion: packageInfo.version }),
36+
disableRequestCompression: config?.disableRequestCompression ?? DEFAULT_DISABLE_REQUEST_COMPRESSION,
3237
maxAttempts: config?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
3338
requestHandler: config?.requestHandler ?? new RequestHandler(defaultConfigProvider),
39+
requestMinCompressionSizeBytes:
40+
config?.requestMinCompressionSizeBytes ?? DEFAULT_NODE_REQUEST_MIN_COMPRESSION_SIZE_BYTES,
3441
retryMode: config?.retryMode ?? (async () => (await defaultConfigProvider()).retryMode || DEFAULT_RETRY_MODE),
3542
sha256: config?.sha256 ?? Sha256,
3643
streamCollector: config?.streamCollector ?? streamCollector,

‎private/aws-protocoltests-json-10/src/runtimeConfig.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import {
99
NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS,
1010
} from "@smithy/config-resolver";
1111
import { Hash } from "@smithy/hash-node";
12+
import {
13+
NODE_DISABLE_REQUEST_COMPRESSION_CONFIG_OPTIONS,
14+
NODE_REQUEST_MIN_COMPRESSION_SIZE_BYTES_CONFIG_OPTIONS,
15+
} from "@smithy/middleware-compression";
1216
import { NODE_MAX_ATTEMPT_CONFIG_OPTIONS, NODE_RETRY_MODE_CONFIG_OPTIONS } from "@smithy/middleware-retry";
1317
import { loadConfig as loadNodeConfig } from "@smithy/node-config-provider";
1418
import { NodeHttpHandler as RequestHandler, streamCollector } from "@smithy/node-http-handler";
@@ -38,8 +42,12 @@ export const getRuntimeConfig = (config: JSONRPC10ClientConfig) => {
3842
defaultUserAgentProvider:
3943
config?.defaultUserAgentProvider ??
4044
defaultUserAgent({ serviceId: clientSharedValues.serviceId, clientVersion: packageInfo.version }),
45+
disableRequestCompression:
46+
config?.disableRequestCompression ?? loadNodeConfig(NODE_DISABLE_REQUEST_COMPRESSION_CONFIG_OPTIONS),
4147
maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
4248
requestHandler: config?.requestHandler ?? new RequestHandler(defaultConfigProvider),
49+
requestMinCompressionSizeBytes:
50+
config?.requestMinCompressionSizeBytes ?? loadNodeConfig(NODE_REQUEST_MIN_COMPRESSION_SIZE_BYTES_CONFIG_OPTIONS),
4351
retryMode:
4452
config?.retryMode ??
4553
loadNodeConfig({

0 commit comments

Comments
 (0)