Skip to content

chore(codegen): sync for client config object custody #6969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 25, 2025
Merged

chore(codegen): sync for client config object custody #6969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
685a46a
chore(codegen): sync for config object custody
kuhe Mar 24, 2025
0aacc23
chore: codegen
kuhe Mar 24, 2025
6da42e9
chore: lockfile update
kuhe Mar 24, 2025
56b668f
chore: update lockfile with manually set smithy versions
kuhe Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
42 changes: 21 additions & 21 deletions clients/client-accessanalyzer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,30 @@
"@aws-sdk/util-endpoints": "*",
"@aws-sdk/util-user-agent-browser": "*",
"@aws-sdk/util-user-agent-node": "*",
"@smithy/config-resolver": "^4.0.1",
"@smithy/core": "^3.1.5",
"@smithy/fetch-http-handler": "^5.0.1",
"@smithy/hash-node": "^4.0.1",
"@smithy/invalid-dependency": "^4.0.1",
"@smithy/middleware-content-length": "^4.0.1",
"@smithy/middleware-endpoint": "^4.0.6",
"@smithy/middleware-retry": "^4.0.7",
"@smithy/middleware-serde": "^4.0.2",
"@smithy/middleware-stack": "^4.0.1",
"@smithy/node-config-provider": "^4.0.1",
"@smithy/node-http-handler": "^4.0.3",
"@smithy/protocol-http": "^5.0.1",
"@smithy/smithy-client": "^4.1.6",
"@smithy/types": "^4.1.0",
"@smithy/url-parser": "^4.0.1",
"@smithy/config-resolver": "^4.1.0",
"@smithy/core": "^3.2.0",
"@smithy/fetch-http-handler": "^5.0.2",
"@smithy/hash-node": "^4.0.2",
"@smithy/invalid-dependency": "^4.0.2",
"@smithy/middleware-content-length": "^4.0.2",
"@smithy/middleware-endpoint": "^4.1.0",
"@smithy/middleware-retry": "^4.1.0",
"@smithy/middleware-serde": "^4.0.3",
"@smithy/middleware-stack": "^4.0.2",
"@smithy/node-config-provider": "^4.0.2",
"@smithy/node-http-handler": "^4.0.4",
"@smithy/protocol-http": "^5.1.0",
"@smithy/smithy-client": "^4.2.0",
"@smithy/types": "^4.2.0",
"@smithy/url-parser": "^4.0.2",
"@smithy/util-base64": "^4.0.0",
"@smithy/util-body-length-browser": "^4.0.0",
"@smithy/util-body-length-node": "^4.0.0",
"@smithy/util-defaults-mode-browser": "^4.0.7",
"@smithy/util-defaults-mode-node": "^4.0.7",
"@smithy/util-endpoints": "^3.0.1",
"@smithy/util-middleware": "^4.0.1",
"@smithy/util-retry": "^4.0.1",
"@smithy/util-defaults-mode-browser": "^4.0.8",
"@smithy/util-defaults-mode-node": "^4.0.8",
"@smithy/util-endpoints": "^3.0.2",
"@smithy/util-middleware": "^4.0.2",
"@smithy/util-retry": "^4.0.2",
"@smithy/util-utf8": "^4.0.0",
"@types/uuid": "^9.0.1",
"tslib": "^2.6.2",
Expand Down
3 changes: 2 additions & 1 deletion clients/client-accessanalyzer/src/AccessAnalyzerClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,8 @@ export class AccessAnalyzerClient extends __Client<

constructor(...[configuration]: __CheckOptionalClientConfig<AccessAnalyzerClientConfig>) {
const _config_0 = __getRuntimeConfig(configuration || {});
super(_config_0 as any);
this.initConfig = _config_0;
const _config_1 = resolveClientEndpointParameters(_config_0);
const _config_2 = resolveUserAgentConfig(_config_1);
const _config_3 = resolveRetryConfig(_config_2);
Expand All @@ -462,7 +464,6 @@ export class AccessAnalyzerClient extends __Client<
const _config_6 = resolveEndpointConfig(_config_5);
const _config_7 = resolveHttpAuthSchemeConfig(_config_6);
const _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []);
super(_config_8);
this.config = _config_8;
this.middlewareStack.use(getUserAgentPlugin(this.config));
this.middlewareStack.use(getRetryPlugin(this.config));
Expand Down
4 changes: 1 addition & 3 deletions clients/client-accessanalyzer/src/auth/httpAuthSchemeProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,5 @@ export const resolveHttpAuthSchemeConfig = <T>(
config: T & HttpAuthSchemeInputConfig & AwsSdkSigV4PreviouslyResolved
): T & HttpAuthSchemeResolvedConfig => {
const config_0 = resolveAwsSdkSigV4Config(config);
return {
...config_0,
} as T & HttpAuthSchemeResolvedConfig;
return Object.assign(config_0, {}) as T & HttpAuthSchemeResolvedConfig;
};
5 changes: 2 additions & 3 deletions clients/client-accessanalyzer/src/endpoint/EndpointParameters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ export type ClientResolvedEndpointParameters = ClientInputEndpointParameters & {
export const resolveClientEndpointParameters = <T>(
options: T & ClientInputEndpointParameters
): T & ClientResolvedEndpointParameters => {
return {
...options,
return Object.assign(options, {
useDualstackEndpoint: options.useDualstackEndpoint ?? false,
useFipsEndpoint: options.useFipsEndpoint ?? false,
defaultSigningName: "access-analyzer",
};
});
};

export const commonParams = {
Expand Down
28 changes: 13 additions & 15 deletions clients/client-accessanalyzer/src/runtimeExtensions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,24 @@ export interface RuntimeExtensionsConfig {
extensions: RuntimeExtension[];
}

const asPartial = <T extends Partial<AccessAnalyzerExtensionConfiguration>>(t: T) => t;

/**
* @internal
*/
export const resolveRuntimeExtensions = (runtimeConfig: any, extensions: RuntimeExtension[]) => {
const extensionConfiguration: AccessAnalyzerExtensionConfiguration = {
...asPartial(getAwsRegionExtensionConfiguration(runtimeConfig)),
...asPartial(getDefaultExtensionConfiguration(runtimeConfig)),
...asPartial(getHttpHandlerExtensionConfiguration(runtimeConfig)),
...asPartial(getHttpAuthExtensionConfiguration(runtimeConfig)),
};
const extensionConfiguration: AccessAnalyzerExtensionConfiguration = Object.assign(
getAwsRegionExtensionConfiguration(runtimeConfig),
getDefaultExtensionConfiguration(runtimeConfig),
getHttpHandlerExtensionConfiguration(runtimeConfig),
getHttpAuthExtensionConfiguration(runtimeConfig)
);

extensions.forEach((extension) => extension.configure(extensionConfiguration));

return {
...runtimeConfig,
...resolveAwsRegionExtensionConfiguration(extensionConfiguration),
...resolveDefaultRuntimeConfig(extensionConfiguration),
...resolveHttpHandlerRuntimeConfig(extensionConfiguration),
...resolveHttpAuthRuntimeConfig(extensionConfiguration),
};
return Object.assign(
runtimeConfig,
resolveAwsRegionExtensionConfiguration(extensionConfiguration),
resolveDefaultRuntimeConfig(extensionConfiguration),
resolveHttpHandlerRuntimeConfig(extensionConfiguration),
resolveHttpAuthRuntimeConfig(extensionConfiguration)
);
};
42 changes: 21 additions & 21 deletions clients/client-account/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,30 @@
"@aws-sdk/util-endpoints": "*",
"@aws-sdk/util-user-agent-browser": "*",
"@aws-sdk/util-user-agent-node": "*",
"@smithy/config-resolver": "^4.0.1",
"@smithy/core": "^3.1.5",
"@smithy/fetch-http-handler": "^5.0.1",
"@smithy/hash-node": "^4.0.1",
"@smithy/invalid-dependency": "^4.0.1",
"@smithy/middleware-content-length": "^4.0.1",
"@smithy/middleware-endpoint": "^4.0.6",
"@smithy/middleware-retry": "^4.0.7",
"@smithy/middleware-serde": "^4.0.2",
"@smithy/middleware-stack": "^4.0.1",
"@smithy/node-config-provider": "^4.0.1",
"@smithy/node-http-handler": "^4.0.3",
"@smithy/protocol-http": "^5.0.1",
"@smithy/smithy-client": "^4.1.6",
"@smithy/types": "^4.1.0",
"@smithy/url-parser": "^4.0.1",
"@smithy/config-resolver": "^4.1.0",
"@smithy/core": "^3.2.0",
"@smithy/fetch-http-handler": "^5.0.2",
"@smithy/hash-node": "^4.0.2",
"@smithy/invalid-dependency": "^4.0.2",
"@smithy/middleware-content-length": "^4.0.2",
"@smithy/middleware-endpoint": "^4.1.0",
"@smithy/middleware-retry": "^4.1.0",
"@smithy/middleware-serde": "^4.0.3",
"@smithy/middleware-stack": "^4.0.2",
"@smithy/node-config-provider": "^4.0.2",
"@smithy/node-http-handler": "^4.0.4",
"@smithy/protocol-http": "^5.1.0",
"@smithy/smithy-client": "^4.2.0",
"@smithy/types": "^4.2.0",
"@smithy/url-parser": "^4.0.2",
"@smithy/util-base64": "^4.0.0",
"@smithy/util-body-length-browser": "^4.0.0",
"@smithy/util-body-length-node": "^4.0.0",
"@smithy/util-defaults-mode-browser": "^4.0.7",
"@smithy/util-defaults-mode-node": "^4.0.7",
"@smithy/util-endpoints": "^3.0.1",
"@smithy/util-middleware": "^4.0.1",
"@smithy/util-retry": "^4.0.1",
"@smithy/util-defaults-mode-browser": "^4.0.8",
"@smithy/util-defaults-mode-node": "^4.0.8",
"@smithy/util-endpoints": "^3.0.2",
"@smithy/util-middleware": "^4.0.2",
"@smithy/util-retry": "^4.0.2",
"@smithy/util-utf8": "^4.0.0",
"tslib": "^2.6.2"
},
Expand Down
3 changes: 2 additions & 1 deletion clients/client-account/src/AccountClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ export class AccountClient extends __Client<

constructor(...[configuration]: __CheckOptionalClientConfig<AccountClientConfig>) {
const _config_0 = __getRuntimeConfig(configuration || {});
super(_config_0 as any);
this.initConfig = _config_0;
const _config_1 = resolveClientEndpointParameters(_config_0);
const _config_2 = resolveUserAgentConfig(_config_1);
const _config_3 = resolveRetryConfig(_config_2);
Expand All @@ -346,7 +348,6 @@ export class AccountClient extends __Client<
const _config_6 = resolveEndpointConfig(_config_5);
const _config_7 = resolveHttpAuthSchemeConfig(_config_6);
const _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []);
super(_config_8);
this.config = _config_8;
this.middlewareStack.use(getUserAgentPlugin(this.config));
this.middlewareStack.use(getRetryPlugin(this.config));
Expand Down
4 changes: 1 addition & 3 deletions clients/client-account/src/auth/httpAuthSchemeProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,5 @@ export const resolveHttpAuthSchemeConfig = <T>(
config: T & HttpAuthSchemeInputConfig & AwsSdkSigV4PreviouslyResolved
): T & HttpAuthSchemeResolvedConfig => {
const config_0 = resolveAwsSdkSigV4Config(config);
return {
...config_0,
} as T & HttpAuthSchemeResolvedConfig;
return Object.assign(config_0, {}) as T & HttpAuthSchemeResolvedConfig;
};
5 changes: 2 additions & 3 deletions clients/client-account/src/endpoint/EndpointParameters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ export type ClientResolvedEndpointParameters = ClientInputEndpointParameters & {
export const resolveClientEndpointParameters = <T>(
options: T & ClientInputEndpointParameters
): T & ClientResolvedEndpointParameters => {
return {
...options,
return Object.assign(options, {
useDualstackEndpoint: options.useDualstackEndpoint ?? false,
useFipsEndpoint: options.useFipsEndpoint ?? false,
defaultSigningName: "account",
};
});
};

export const commonParams = {
Expand Down
28 changes: 13 additions & 15 deletions clients/client-account/src/runtimeExtensions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,24 @@ export interface RuntimeExtensionsConfig {
extensions: RuntimeExtension[];
}

const asPartial = <T extends Partial<AccountExtensionConfiguration>>(t: T) => t;

/**
* @internal
*/
export const resolveRuntimeExtensions = (runtimeConfig: any, extensions: RuntimeExtension[]) => {
const extensionConfiguration: AccountExtensionConfiguration = {
...asPartial(getAwsRegionExtensionConfiguration(runtimeConfig)),
...asPartial(getDefaultExtensionConfiguration(runtimeConfig)),
...asPartial(getHttpHandlerExtensionConfiguration(runtimeConfig)),
...asPartial(getHttpAuthExtensionConfiguration(runtimeConfig)),
};
const extensionConfiguration: AccountExtensionConfiguration = Object.assign(
getAwsRegionExtensionConfiguration(runtimeConfig),
getDefaultExtensionConfiguration(runtimeConfig),
getHttpHandlerExtensionConfiguration(runtimeConfig),
getHttpAuthExtensionConfiguration(runtimeConfig)
);

extensions.forEach((extension) => extension.configure(extensionConfiguration));

return {
...runtimeConfig,
...resolveAwsRegionExtensionConfiguration(extensionConfiguration),
...resolveDefaultRuntimeConfig(extensionConfiguration),
...resolveHttpHandlerRuntimeConfig(extensionConfiguration),
...resolveHttpAuthRuntimeConfig(extensionConfiguration),
};
return Object.assign(
runtimeConfig,
resolveAwsRegionExtensionConfiguration(extensionConfiguration),
resolveDefaultRuntimeConfig(extensionConfiguration),
resolveHttpHandlerRuntimeConfig(extensionConfiguration),
resolveHttpAuthRuntimeConfig(extensionConfiguration)
);
};
44 changes: 22 additions & 22 deletions clients/client-acm-pca/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,32 @@
"@aws-sdk/util-endpoints": "*",
"@aws-sdk/util-user-agent-browser": "*",
"@aws-sdk/util-user-agent-node": "*",
"@smithy/config-resolver": "^4.0.1",
"@smithy/core": "^3.1.5",
"@smithy/fetch-http-handler": "^5.0.1",
"@smithy/hash-node": "^4.0.1",
"@smithy/invalid-dependency": "^4.0.1",
"@smithy/middleware-content-length": "^4.0.1",
"@smithy/middleware-endpoint": "^4.0.6",
"@smithy/middleware-retry": "^4.0.7",
"@smithy/middleware-serde": "^4.0.2",
"@smithy/middleware-stack": "^4.0.1",
"@smithy/node-config-provider": "^4.0.1",
"@smithy/node-http-handler": "^4.0.3",
"@smithy/protocol-http": "^5.0.1",
"@smithy/smithy-client": "^4.1.6",
"@smithy/types": "^4.1.0",
"@smithy/url-parser": "^4.0.1",
"@smithy/config-resolver": "^4.1.0",
"@smithy/core": "^3.2.0",
"@smithy/fetch-http-handler": "^5.0.2",
"@smithy/hash-node": "^4.0.2",
"@smithy/invalid-dependency": "^4.0.2",
"@smithy/middleware-content-length": "^4.0.2",
"@smithy/middleware-endpoint": "^4.1.0",
"@smithy/middleware-retry": "^4.1.0",
"@smithy/middleware-serde": "^4.0.3",
"@smithy/middleware-stack": "^4.0.2",
"@smithy/node-config-provider": "^4.0.2",
"@smithy/node-http-handler": "^4.0.4",
"@smithy/protocol-http": "^5.1.0",
"@smithy/smithy-client": "^4.2.0",
"@smithy/types": "^4.2.0",
"@smithy/url-parser": "^4.0.2",
"@smithy/util-base64": "^4.0.0",
"@smithy/util-body-length-browser": "^4.0.0",
"@smithy/util-body-length-node": "^4.0.0",
"@smithy/util-defaults-mode-browser": "^4.0.7",
"@smithy/util-defaults-mode-node": "^4.0.7",
"@smithy/util-endpoints": "^3.0.1",
"@smithy/util-middleware": "^4.0.1",
"@smithy/util-retry": "^4.0.1",
"@smithy/util-defaults-mode-browser": "^4.0.8",
"@smithy/util-defaults-mode-node": "^4.0.8",
"@smithy/util-endpoints": "^3.0.2",
"@smithy/util-middleware": "^4.0.2",
"@smithy/util-retry": "^4.0.2",
"@smithy/util-utf8": "^4.0.0",
"@smithy/util-waiter": "^4.0.2",
"@smithy/util-waiter": "^4.0.3",
"tslib": "^2.6.2"
},
"devDependencies": {
Expand Down
3 changes: 2 additions & 1 deletion clients/client-acm-pca/src/ACMPCAClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,8 @@ export class ACMPCAClient extends __Client<

constructor(...[configuration]: __CheckOptionalClientConfig<ACMPCAClientConfig>) {
const _config_0 = __getRuntimeConfig(configuration || {});
super(_config_0 as any);
this.initConfig = _config_0;
const _config_1 = resolveClientEndpointParameters(_config_0);
const _config_2 = resolveUserAgentConfig(_config_1);
const _config_3 = resolveRetryConfig(_config_2);
Expand All @@ -412,7 +414,6 @@ export class ACMPCAClient extends __Client<
const _config_6 = resolveEndpointConfig(_config_5);
const _config_7 = resolveHttpAuthSchemeConfig(_config_6);
const _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []);
super(_config_8);
this.config = _config_8;
this.middlewareStack.use(getUserAgentPlugin(this.config));
this.middlewareStack.use(getRetryPlugin(this.config));
Expand Down
4 changes: 1 addition & 3 deletions clients/client-acm-pca/src/auth/httpAuthSchemeProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,5 @@ export const resolveHttpAuthSchemeConfig = <T>(
config: T & HttpAuthSchemeInputConfig & AwsSdkSigV4PreviouslyResolved
): T & HttpAuthSchemeResolvedConfig => {
const config_0 = resolveAwsSdkSigV4Config(config);
return {
...config_0,
} as T & HttpAuthSchemeResolvedConfig;
return Object.assign(config_0, {}) as T & HttpAuthSchemeResolvedConfig;
};
5 changes: 2 additions & 3 deletions clients/client-acm-pca/src/endpoint/EndpointParameters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ export type ClientResolvedEndpointParameters = ClientInputEndpointParameters & {
export const resolveClientEndpointParameters = <T>(
options: T & ClientInputEndpointParameters
): T & ClientResolvedEndpointParameters => {
return {
...options,
return Object.assign(options, {
useDualstackEndpoint: options.useDualstackEndpoint ?? false,
useFipsEndpoint: options.useFipsEndpoint ?? false,
defaultSigningName: "acm-pca",
};
});
};

export const commonParams = {
Expand Down
Loading
Loading