Skip to content

Commit cdef3e5

Browse files
chore(clients): import fromUtf8 and toUtf8 from util-utf8 (#4363)
1 parent 0aa3fb9 commit cdef3e5

File tree

1,378 files changed

+1378
-2756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,378 files changed

+1378
-2756
lines changed

clients/client-accessanalyzer/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
"@aws-sdk/util-retry": "*",
5252
"@aws-sdk/util-user-agent-browser": "*",
5353
"@aws-sdk/util-user-agent-node": "*",
54-
"@aws-sdk/util-utf8-browser": "*",
55-
"@aws-sdk/util-utf8-node": "*",
54+
"@aws-sdk/util-utf8": "*",
5655
"tslib": "^2.3.1",
5756
"uuid": "^8.3.2"
5857
},

clients/client-accessanalyzer/src/runtimeConfig.browser.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { invalidProvider } from "@aws-sdk/invalid-dependency";
99
import { calculateBodyLength } from "@aws-sdk/util-body-length-browser";
1010
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1111
import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
12-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-browser";
1312
import { AccessAnalyzerClientConfig } from "./AccessAnalyzerClient";
1413
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
1514
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -41,7 +40,5 @@ export const getRuntimeConfig = (config: AccessAnalyzerClientConfig) => {
4140
streamCollector: config?.streamCollector ?? streamCollector,
4241
useDualstackEndpoint: config?.useDualstackEndpoint ?? (() => Promise.resolve(DEFAULT_USE_DUALSTACK_ENDPOINT)),
4342
useFipsEndpoint: config?.useFipsEndpoint ?? (() => Promise.resolve(DEFAULT_USE_FIPS_ENDPOINT)),
44-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
45-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
4643
};
4744
};

clients/client-accessanalyzer/src/runtimeConfig.shared.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { NoOpLogger } from "@aws-sdk/smithy-client";
33
import { parseUrl } from "@aws-sdk/url-parser";
44
import { fromBase64, toBase64 } from "@aws-sdk/util-base64";
5+
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8";
56

67
import { AccessAnalyzerClientConfig } from "./AccessAnalyzerClient";
78
import { defaultEndpointResolver } from "./endpoint/endpointResolver";
@@ -18,4 +19,6 @@ export const getRuntimeConfig = (config: AccessAnalyzerClientConfig) => ({
1819
logger: config?.logger ?? new NoOpLogger(),
1920
serviceId: config?.serviceId ?? "AccessAnalyzer",
2021
urlParser: config?.urlParser ?? parseUrl,
22+
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
23+
utf8Encoder: config?.utf8Encoder ?? toUtf8,
2124
});

clients/client-accessanalyzer/src/runtimeConfig.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { NodeHttpHandler as RequestHandler, streamCollector } from "@aws-sdk/nod
1717
import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
1818
import { DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1919
import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
20-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-node";
2120
import { AccessAnalyzerClientConfig } from "./AccessAnalyzerClient";
2221
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
2322
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -56,7 +55,5 @@ export const getRuntimeConfig = (config: AccessAnalyzerClientConfig) => {
5655
streamCollector: config?.streamCollector ?? streamCollector,
5756
useDualstackEndpoint: config?.useDualstackEndpoint ?? loadNodeConfig(NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS),
5857
useFipsEndpoint: config?.useFipsEndpoint ?? loadNodeConfig(NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS),
59-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
60-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
6158
};
6259
};

clients/client-account/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
"@aws-sdk/util-retry": "*",
5252
"@aws-sdk/util-user-agent-browser": "*",
5353
"@aws-sdk/util-user-agent-node": "*",
54-
"@aws-sdk/util-utf8-browser": "*",
55-
"@aws-sdk/util-utf8-node": "*",
54+
"@aws-sdk/util-utf8": "*",
5655
"tslib": "^2.3.1"
5756
},
5857
"devDependencies": {

clients/client-account/src/runtimeConfig.browser.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { invalidProvider } from "@aws-sdk/invalid-dependency";
99
import { calculateBodyLength } from "@aws-sdk/util-body-length-browser";
1010
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1111
import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
12-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-browser";
1312
import { AccountClientConfig } from "./AccountClient";
1413
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
1514
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -41,7 +40,5 @@ export const getRuntimeConfig = (config: AccountClientConfig) => {
4140
streamCollector: config?.streamCollector ?? streamCollector,
4241
useDualstackEndpoint: config?.useDualstackEndpoint ?? (() => Promise.resolve(DEFAULT_USE_DUALSTACK_ENDPOINT)),
4342
useFipsEndpoint: config?.useFipsEndpoint ?? (() => Promise.resolve(DEFAULT_USE_FIPS_ENDPOINT)),
44-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
45-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
4643
};
4744
};

clients/client-account/src/runtimeConfig.shared.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { NoOpLogger } from "@aws-sdk/smithy-client";
33
import { parseUrl } from "@aws-sdk/url-parser";
44
import { fromBase64, toBase64 } from "@aws-sdk/util-base64";
5+
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8";
56

67
import { AccountClientConfig } from "./AccountClient";
78
import { defaultEndpointResolver } from "./endpoint/endpointResolver";
@@ -18,4 +19,6 @@ export const getRuntimeConfig = (config: AccountClientConfig) => ({
1819
logger: config?.logger ?? new NoOpLogger(),
1920
serviceId: config?.serviceId ?? "Account",
2021
urlParser: config?.urlParser ?? parseUrl,
22+
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
23+
utf8Encoder: config?.utf8Encoder ?? toUtf8,
2124
});

clients/client-account/src/runtimeConfig.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { NodeHttpHandler as RequestHandler, streamCollector } from "@aws-sdk/nod
1717
import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
1818
import { DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1919
import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
20-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-node";
2120
import { AccountClientConfig } from "./AccountClient";
2221
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
2322
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -56,7 +55,5 @@ export const getRuntimeConfig = (config: AccountClientConfig) => {
5655
streamCollector: config?.streamCollector ?? streamCollector,
5756
useDualstackEndpoint: config?.useDualstackEndpoint ?? loadNodeConfig(NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS),
5857
useFipsEndpoint: config?.useFipsEndpoint ?? loadNodeConfig(NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS),
59-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
60-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
6158
};
6259
};

clients/client-acm-pca/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
"@aws-sdk/util-retry": "*",
5252
"@aws-sdk/util-user-agent-browser": "*",
5353
"@aws-sdk/util-user-agent-node": "*",
54-
"@aws-sdk/util-utf8-browser": "*",
55-
"@aws-sdk/util-utf8-node": "*",
54+
"@aws-sdk/util-utf8": "*",
5655
"@aws-sdk/util-waiter": "*",
5756
"tslib": "^2.3.1"
5857
},

clients/client-acm-pca/src/runtimeConfig.browser.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { invalidProvider } from "@aws-sdk/invalid-dependency";
99
import { calculateBodyLength } from "@aws-sdk/util-body-length-browser";
1010
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1111
import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
12-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-browser";
1312
import { ACMPCAClientConfig } from "./ACMPCAClient";
1413
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
1514
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -41,7 +40,5 @@ export const getRuntimeConfig = (config: ACMPCAClientConfig) => {
4140
streamCollector: config?.streamCollector ?? streamCollector,
4241
useDualstackEndpoint: config?.useDualstackEndpoint ?? (() => Promise.resolve(DEFAULT_USE_DUALSTACK_ENDPOINT)),
4342
useFipsEndpoint: config?.useFipsEndpoint ?? (() => Promise.resolve(DEFAULT_USE_FIPS_ENDPOINT)),
44-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
45-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
4643
};
4744
};

clients/client-acm-pca/src/runtimeConfig.shared.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { NoOpLogger } from "@aws-sdk/smithy-client";
33
import { parseUrl } from "@aws-sdk/url-parser";
44
import { fromBase64, toBase64 } from "@aws-sdk/util-base64";
5+
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8";
56

67
import { ACMPCAClientConfig } from "./ACMPCAClient";
78
import { defaultEndpointResolver } from "./endpoint/endpointResolver";
@@ -18,4 +19,6 @@ export const getRuntimeConfig = (config: ACMPCAClientConfig) => ({
1819
logger: config?.logger ?? new NoOpLogger(),
1920
serviceId: config?.serviceId ?? "ACM PCA",
2021
urlParser: config?.urlParser ?? parseUrl,
22+
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
23+
utf8Encoder: config?.utf8Encoder ?? toUtf8,
2124
});

clients/client-acm-pca/src/runtimeConfig.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { NodeHttpHandler as RequestHandler, streamCollector } from "@aws-sdk/nod
1717
import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
1818
import { DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1919
import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
20-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-node";
2120
import { ACMPCAClientConfig } from "./ACMPCAClient";
2221
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
2322
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -56,7 +55,5 @@ export const getRuntimeConfig = (config: ACMPCAClientConfig) => {
5655
streamCollector: config?.streamCollector ?? streamCollector,
5756
useDualstackEndpoint: config?.useDualstackEndpoint ?? loadNodeConfig(NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS),
5857
useFipsEndpoint: config?.useFipsEndpoint ?? loadNodeConfig(NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS),
59-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
60-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
6158
};
6259
};

clients/client-acm/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
"@aws-sdk/util-retry": "*",
5252
"@aws-sdk/util-user-agent-browser": "*",
5353
"@aws-sdk/util-user-agent-node": "*",
54-
"@aws-sdk/util-utf8-browser": "*",
55-
"@aws-sdk/util-utf8-node": "*",
54+
"@aws-sdk/util-utf8": "*",
5655
"@aws-sdk/util-waiter": "*",
5756
"tslib": "^2.3.1"
5857
},

clients/client-acm/src/runtimeConfig.browser.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { invalidProvider } from "@aws-sdk/invalid-dependency";
99
import { calculateBodyLength } from "@aws-sdk/util-body-length-browser";
1010
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1111
import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
12-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-browser";
1312
import { ACMClientConfig } from "./ACMClient";
1413
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
1514
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -41,7 +40,5 @@ export const getRuntimeConfig = (config: ACMClientConfig) => {
4140
streamCollector: config?.streamCollector ?? streamCollector,
4241
useDualstackEndpoint: config?.useDualstackEndpoint ?? (() => Promise.resolve(DEFAULT_USE_DUALSTACK_ENDPOINT)),
4342
useFipsEndpoint: config?.useFipsEndpoint ?? (() => Promise.resolve(DEFAULT_USE_FIPS_ENDPOINT)),
44-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
45-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
4643
};
4744
};

clients/client-acm/src/runtimeConfig.shared.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { NoOpLogger } from "@aws-sdk/smithy-client";
33
import { parseUrl } from "@aws-sdk/url-parser";
44
import { fromBase64, toBase64 } from "@aws-sdk/util-base64";
5+
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8";
56

67
import { ACMClientConfig } from "./ACMClient";
78
import { defaultEndpointResolver } from "./endpoint/endpointResolver";
@@ -18,4 +19,6 @@ export const getRuntimeConfig = (config: ACMClientConfig) => ({
1819
logger: config?.logger ?? new NoOpLogger(),
1920
serviceId: config?.serviceId ?? "ACM",
2021
urlParser: config?.urlParser ?? parseUrl,
22+
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
23+
utf8Encoder: config?.utf8Encoder ?? toUtf8,
2124
});

clients/client-acm/src/runtimeConfig.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { NodeHttpHandler as RequestHandler, streamCollector } from "@aws-sdk/nod
1717
import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
1818
import { DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1919
import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
20-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-node";
2120
import { ACMClientConfig } from "./ACMClient";
2221
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
2322
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -56,7 +55,5 @@ export const getRuntimeConfig = (config: ACMClientConfig) => {
5655
streamCollector: config?.streamCollector ?? streamCollector,
5756
useDualstackEndpoint: config?.useDualstackEndpoint ?? loadNodeConfig(NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS),
5857
useFipsEndpoint: config?.useFipsEndpoint ?? loadNodeConfig(NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS),
59-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
60-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
6158
};
6259
};

clients/client-alexa-for-business/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
"@aws-sdk/util-retry": "*",
5252
"@aws-sdk/util-user-agent-browser": "*",
5353
"@aws-sdk/util-user-agent-node": "*",
54-
"@aws-sdk/util-utf8-browser": "*",
55-
"@aws-sdk/util-utf8-node": "*",
54+
"@aws-sdk/util-utf8": "*",
5655
"tslib": "^2.3.1",
5756
"uuid": "^8.3.2"
5857
},

clients/client-alexa-for-business/src/runtimeConfig.browser.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { invalidProvider } from "@aws-sdk/invalid-dependency";
99
import { calculateBodyLength } from "@aws-sdk/util-body-length-browser";
1010
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1111
import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
12-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-browser";
1312
import { AlexaForBusinessClientConfig } from "./AlexaForBusinessClient";
1413
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
1514
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -41,7 +40,5 @@ export const getRuntimeConfig = (config: AlexaForBusinessClientConfig) => {
4140
streamCollector: config?.streamCollector ?? streamCollector,
4241
useDualstackEndpoint: config?.useDualstackEndpoint ?? (() => Promise.resolve(DEFAULT_USE_DUALSTACK_ENDPOINT)),
4342
useFipsEndpoint: config?.useFipsEndpoint ?? (() => Promise.resolve(DEFAULT_USE_FIPS_ENDPOINT)),
44-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
45-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
4643
};
4744
};

clients/client-alexa-for-business/src/runtimeConfig.shared.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { NoOpLogger } from "@aws-sdk/smithy-client";
33
import { parseUrl } from "@aws-sdk/url-parser";
44
import { fromBase64, toBase64 } from "@aws-sdk/util-base64";
5+
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8";
56

67
import { AlexaForBusinessClientConfig } from "./AlexaForBusinessClient";
78
import { defaultEndpointResolver } from "./endpoint/endpointResolver";
@@ -18,4 +19,6 @@ export const getRuntimeConfig = (config: AlexaForBusinessClientConfig) => ({
1819
logger: config?.logger ?? new NoOpLogger(),
1920
serviceId: config?.serviceId ?? "Alexa For Business",
2021
urlParser: config?.urlParser ?? parseUrl,
22+
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
23+
utf8Encoder: config?.utf8Encoder ?? toUtf8,
2124
});

clients/client-alexa-for-business/src/runtimeConfig.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { NodeHttpHandler as RequestHandler, streamCollector } from "@aws-sdk/nod
1717
import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
1818
import { DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1919
import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
20-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-node";
2120
import { AlexaForBusinessClientConfig } from "./AlexaForBusinessClient";
2221
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
2322
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -56,7 +55,5 @@ export const getRuntimeConfig = (config: AlexaForBusinessClientConfig) => {
5655
streamCollector: config?.streamCollector ?? streamCollector,
5756
useDualstackEndpoint: config?.useDualstackEndpoint ?? loadNodeConfig(NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS),
5857
useFipsEndpoint: config?.useFipsEndpoint ?? loadNodeConfig(NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS),
59-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
60-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
6158
};
6259
};

clients/client-amp/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
"@aws-sdk/util-retry": "*",
5252
"@aws-sdk/util-user-agent-browser": "*",
5353
"@aws-sdk/util-user-agent-node": "*",
54-
"@aws-sdk/util-utf8-browser": "*",
55-
"@aws-sdk/util-utf8-node": "*",
54+
"@aws-sdk/util-utf8": "*",
5655
"@aws-sdk/util-waiter": "*",
5756
"tslib": "^2.3.1",
5857
"uuid": "^8.3.2"

clients/client-amp/src/runtimeConfig.browser.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { invalidProvider } from "@aws-sdk/invalid-dependency";
99
import { calculateBodyLength } from "@aws-sdk/util-body-length-browser";
1010
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1111
import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
12-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-browser";
1312
import { AmpClientConfig } from "./AmpClient";
1413
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
1514
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -41,7 +40,5 @@ export const getRuntimeConfig = (config: AmpClientConfig) => {
4140
streamCollector: config?.streamCollector ?? streamCollector,
4241
useDualstackEndpoint: config?.useDualstackEndpoint ?? (() => Promise.resolve(DEFAULT_USE_DUALSTACK_ENDPOINT)),
4342
useFipsEndpoint: config?.useFipsEndpoint ?? (() => Promise.resolve(DEFAULT_USE_FIPS_ENDPOINT)),
44-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
45-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
4643
};
4744
};

clients/client-amp/src/runtimeConfig.shared.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { NoOpLogger } from "@aws-sdk/smithy-client";
33
import { parseUrl } from "@aws-sdk/url-parser";
44
import { fromBase64, toBase64 } from "@aws-sdk/util-base64";
5+
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8";
56

67
import { AmpClientConfig } from "./AmpClient";
78
import { defaultEndpointResolver } from "./endpoint/endpointResolver";
@@ -18,4 +19,6 @@ export const getRuntimeConfig = (config: AmpClientConfig) => ({
1819
logger: config?.logger ?? new NoOpLogger(),
1920
serviceId: config?.serviceId ?? "amp",
2021
urlParser: config?.urlParser ?? parseUrl,
22+
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
23+
utf8Encoder: config?.utf8Encoder ?? toUtf8,
2124
});

clients/client-amp/src/runtimeConfig.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { NodeHttpHandler as RequestHandler, streamCollector } from "@aws-sdk/nod
1717
import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
1818
import { DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1919
import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
20-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-node";
2120
import { AmpClientConfig } from "./AmpClient";
2221
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
2322
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -56,7 +55,5 @@ export const getRuntimeConfig = (config: AmpClientConfig) => {
5655
streamCollector: config?.streamCollector ?? streamCollector,
5756
useDualstackEndpoint: config?.useDualstackEndpoint ?? loadNodeConfig(NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS),
5857
useFipsEndpoint: config?.useFipsEndpoint ?? loadNodeConfig(NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS),
59-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
60-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
6158
};
6259
};

clients/client-amplify/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
"@aws-sdk/util-retry": "*",
5252
"@aws-sdk/util-user-agent-browser": "*",
5353
"@aws-sdk/util-user-agent-node": "*",
54-
"@aws-sdk/util-utf8-browser": "*",
55-
"@aws-sdk/util-utf8-node": "*",
54+
"@aws-sdk/util-utf8": "*",
5655
"tslib": "^2.3.1"
5756
},
5857
"devDependencies": {

clients/client-amplify/src/runtimeConfig.browser.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { invalidProvider } from "@aws-sdk/invalid-dependency";
99
import { calculateBodyLength } from "@aws-sdk/util-body-length-browser";
1010
import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@aws-sdk/util-retry";
1111
import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
12-
import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-browser";
1312
import { AmplifyClientConfig } from "./AmplifyClient";
1413
import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
1514
import { loadConfigsForDefaultMode } from "@aws-sdk/smithy-client";
@@ -41,7 +40,5 @@ export const getRuntimeConfig = (config: AmplifyClientConfig) => {
4140
streamCollector: config?.streamCollector ?? streamCollector,
4241
useDualstackEndpoint: config?.useDualstackEndpoint ?? (() => Promise.resolve(DEFAULT_USE_DUALSTACK_ENDPOINT)),
4342
useFipsEndpoint: config?.useFipsEndpoint ?? (() => Promise.resolve(DEFAULT_USE_FIPS_ENDPOINT)),
44-
utf8Decoder: config?.utf8Decoder ?? fromUtf8,
45-
utf8Encoder: config?.utf8Encoder ?? toUtf8,
4643
};
4744
};

0 commit comments

Comments
 (0)