Skip to content

Commit 4235b6c

Browse files
Chase Coalwelltrivikr
Chase Coalwell
authored andcommitted
fix: update input and resolved naming (#444)
1 parent 7ec275a commit 4235b6c

File tree

9 files changed

+50
-50
lines changed

9 files changed

+50
-50
lines changed

Diff for: clients/client-rds-data/RdsDataServiceClient.ts

+20-20
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,30 @@ import {
2323
Encoder
2424
} from "@aws-sdk/types";
2525
import {
26-
EndpointsConfigInput,
27-
EndpointsConfigResolved,
26+
EndpointsInputConfig,
27+
EndpointsResolvedConfig,
2828
resolveEndpointsConfig,
2929
destroyRequestHandlerConfig,
30-
RegionConfigInput,
31-
RegionConfigResolved,
30+
RegionInputConfig,
31+
RegionResolvedConfig,
3232
resolveRegionConfig
3333
} from "@aws-sdk/config-resolver";
3434
import { getContentLengthPlugin } from "@aws-sdk/middleware-content-length";
3535
import {
36-
UserAgentConfigInput,
37-
UserAgentConfigResolved,
36+
UserAgentInputConfig,
37+
UserAgentResolvedConfig,
3838
resolveUserAgentConfig,
3939
getUserAgentPlugin
4040
} from "@aws-sdk/middleware-user-agent";
4141
import {
42-
RetryConfigInput,
43-
RetryConfigResolved,
42+
RetryInputConfig,
43+
RetryResolvedConfig,
4444
resolveRetryConfig,
4545
getRetryPlugin
4646
} from "@aws-sdk/middleware-retry";
4747
import {
48-
AwsAuthConfigInput,
49-
AwsAuthConfigResolved,
48+
AwsAuthInputConfig,
49+
AwsAuthResolvedConfig,
5050
resolveAwsAuthConfig,
5151
getAwsAuthPlugin
5252
} from "@aws-sdk/middleware-signing";
@@ -151,21 +151,21 @@ export interface RDSDataRuntimeDependencies {
151151
}
152152

153153
export type RdsDataServiceConfig = RDSDataRuntimeDependencies &
154-
AwsAuthConfigInput &
155-
RegionConfigInput &
156-
RetryConfigInput &
157-
EndpointsConfigInput &
158-
UserAgentConfigInput;
154+
AwsAuthInputConfig &
155+
RegionInputConfig &
156+
RetryInputConfig &
157+
EndpointsInputConfig &
158+
UserAgentInputConfig;
159159

160160
export type RdsDataServiceResolvedConfig = SmithyResolvedConfiguration<
161161
__HttpOptions
162162
> &
163163
Required<RDSDataRuntimeDependencies> &
164-
AwsAuthConfigResolved &
165-
RegionConfigResolved &
166-
RetryConfigResolved &
167-
EndpointsConfigResolved &
168-
UserAgentConfigResolved;
164+
AwsAuthResolvedConfig &
165+
RegionResolvedConfig &
166+
RetryResolvedConfig &
167+
EndpointsResolvedConfig &
168+
UserAgentResolvedConfig;
169169

170170
export class RdsDataService extends SmithyClient<
171171
__HttpOptions,

Diff for: packages/config-resolver/src/EndpointsConfig.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function normalizeEndpoint(
1414
return endpoint!;
1515
}
1616

17-
export interface EndpointsConfigInput {
17+
export interface EndpointsInputConfig {
1818
/**
1919
* The fully qualified endpoint of the webservice. This is only required when using a custom endpoint (for example, when using a local version of S3).
2020
*/
@@ -35,13 +35,13 @@ interface PreviouslyResolved {
3535
region: Provider<string>;
3636
service: string;
3737
}
38-
export interface EndpointsConfigResolved
39-
extends Required<EndpointsConfigInput> {
38+
export interface EndpointsResolvedConfig
39+
extends Required<EndpointsInputConfig> {
4040
endpoint: Provider<Endpoint>;
4141
}
4242
export function resolveEndpointsConfig<T>(
43-
input: T & EndpointsConfigInput & PreviouslyResolved
44-
): T & EndpointsConfigResolved {
43+
input: T & EndpointsInputConfig & PreviouslyResolved
44+
): T & EndpointsResolvedConfig {
4545
const tls = input.tls || true;
4646
const defaultProvider = (tls: boolean, region: string) => ({
4747
protocol: tls ? "https:" : "http:",

Diff for: packages/config-resolver/src/RegionConfig.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Provider } from "@aws-sdk/types";
22

3-
export interface RegionConfigInput {
3+
export interface RegionInputConfig {
44
/**
55
* The AWS region to which this client will send requests
66
*/
@@ -9,12 +9,12 @@ export interface RegionConfigInput {
99
interface PreviouslyResolved {
1010
regionDefaultProvider: (input: any) => Provider<string>;
1111
}
12-
export interface RegionConfigResolved {
12+
export interface RegionResolvedConfig {
1313
region: Provider<string>;
1414
}
1515
export function resolveRegionConfig<T>(
16-
input: T & RegionConfigInput & PreviouslyResolved
17-
): T & RegionConfigResolved {
16+
input: T & RegionInputConfig & PreviouslyResolved
17+
): T & RegionResolvedConfig {
1818
let region = input.region || input.regionDefaultProvider(input as any);
1919
return {
2020
...input,

Diff for: packages/middleware-retry/src/configurations.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { RetryStrategy } from "@aws-sdk/types";
22
import { ExponentialBackOffStrategy } from "./defaultStrategy";
33

4-
export interface RetryConfigInput {
4+
export interface RetryInputConfig {
55
/**
66
* The maximum number of times requests that encounter potentially transient failures should be retried
77
*/
@@ -11,13 +11,13 @@ export interface RetryConfigInput {
1111
*/
1212
retryStrategy?: RetryStrategy;
1313
}
14-
export interface RetryConfigResolved {
14+
export interface RetryResolvedConfig {
1515
maxRetries: number;
1616
retryStrategy: RetryStrategy;
1717
}
1818
export function resolveRetryConfig<T>(
19-
input: T & RetryConfigInput
20-
): T & RetryConfigResolved {
19+
input: T & RetryInputConfig
20+
): T & RetryResolvedConfig {
2121
const maxRetries = input.maxRetries === undefined ? 3 : input.maxRetries;
2222
return {
2323
...input,

Diff for: packages/middleware-retry/src/retryMiddleware.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import {
55
FinalizeHandlerOutput,
66
Pluggable
77
} from "@aws-sdk/types";
8-
import { RetryConfigResolved } from "./configurations";
8+
import { RetryResolvedConfig } from "./configurations";
99

10-
export function retryMiddleware(options: RetryConfigResolved) {
10+
export function retryMiddleware(options: RetryResolvedConfig) {
1111
return <Output extends MetadataBearer = MetadataBearer>(
1212
next: FinalizeHandler<any, Output>
1313
): FinalizeHandler<any, Output> => async (
@@ -18,7 +18,7 @@ export function retryMiddleware(options: RetryConfigResolved) {
1818
}
1919

2020
export const getRetryPlugin = (
21-
options: RetryConfigResolved
21+
options: RetryResolvedConfig
2222
): Pluggable<any, any> => ({
2323
applyToStack: clientStack => {
2424
if (options.maxRetries > 0) {

Diff for: packages/middleware-signing/src/configurations.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
} from "@aws-sdk/types";
77
import { SignatureV4 } from "@aws-sdk/signature-v4";
88

9-
export interface AwsAuthConfigInput {
9+
export interface AwsAuthInputConfig {
1010
/**
1111
* The credentials used to sign requests.
1212
*/
@@ -28,14 +28,14 @@ interface PreviouslyResolved {
2828
signingName: string;
2929
sha256: HashConstructor;
3030
}
31-
export interface AwsAuthConfigResolved {
31+
export interface AwsAuthResolvedConfig {
3232
credentials: Provider<Credentials>;
3333
signer: RequestSigner;
3434
signingEscapePath: boolean;
3535
}
3636
export function resolveAwsAuthConfig<T>(
37-
input: T & AwsAuthConfigInput & PreviouslyResolved
38-
): T & AwsAuthConfigResolved {
37+
input: T & AwsAuthInputConfig & PreviouslyResolved
38+
): T & AwsAuthResolvedConfig {
3939
let credentials =
4040
input.credentials || input.credentialDefaultProvider(input as any);
4141
const normalizedCreds = normalizeProvider(credentials);

Diff for: packages/middleware-signing/src/middleware.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import {
55
FinalizeHandlerOutput,
66
Pluggable
77
} from "@aws-sdk/types";
8-
import { AwsAuthConfigResolved } from "./configurations";
8+
import { AwsAuthResolvedConfig } from "./configurations";
99
import { HttpRequest } from "@aws-sdk/protocol-http";
1010

1111
export function signingMiddleware<Input extends object, Output extends object>(
12-
options: AwsAuthConfigResolved
12+
options: AwsAuthResolvedConfig
1313
): FinalizeRequestMiddleware<Input, Output> {
1414
return (
1515
next: FinalizeHandler<Input, Output>
@@ -26,7 +26,7 @@ export function signingMiddleware<Input extends object, Output extends object>(
2626
}
2727

2828
export const getAwsAuthPlugin = (
29-
options: AwsAuthConfigResolved
29+
options: AwsAuthResolvedConfig
3030
): Pluggable<any, any> => ({
3131
applyToStack: clientStack => {
3232
clientStack.add(signingMiddleware(options), {

Diff for: packages/middleware-user-agent/src/configurations.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export interface UserAgentConfigInput {
1+
export interface UserAgentInputConfig {
22
/**
33
* The custom user agent header that would be appended to default one
44
*/
@@ -7,12 +7,12 @@ export interface UserAgentConfigInput {
77
interface PreviouslyResolved {
88
defaultUserAgent: string;
99
}
10-
export interface UserAgentConfigResolved {
10+
export interface UserAgentResolvedConfig {
1111
defaultUserAgent: string;
1212
customUserAgent?: string;
1313
}
1414
export function resolveUserAgentConfig<T>(
15-
input: T & PreviouslyResolved & UserAgentConfigInput
16-
): T & UserAgentConfigResolved {
15+
input: T & PreviouslyResolved & UserAgentInputConfig
16+
): T & UserAgentResolvedConfig {
1717
return input;
1818
}

Diff for: packages/middleware-user-agent/src/middleware.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import {
66
Pluggable
77
} from "@aws-sdk/types";
88
import { HttpRequest } from "@aws-sdk/protocol-http";
9-
import { UserAgentConfigResolved } from "./configurations";
9+
import { UserAgentResolvedConfig } from "./configurations";
1010

1111
const userAgentHeader = "User-Agent";
1212

13-
export function userAgentMiddleware(options: UserAgentConfigResolved) {
13+
export function userAgentMiddleware(options: UserAgentResolvedConfig) {
1414
return <Output extends MetadataBearer>(
1515
next: BuildHandler<any, any>
1616
): BuildHandler<any, any> => (
@@ -35,7 +35,7 @@ export function userAgentMiddleware(options: UserAgentConfigResolved) {
3535
}
3636

3737
export const getUserAgentPlugin = (
38-
config: UserAgentConfigResolved
38+
config: UserAgentResolvedConfig
3939
): Pluggable<any, any> => ({
4040
applyToStack: clientStack => {
4141
clientStack.add(userAgentMiddleware(config), {

0 commit comments

Comments
 (0)