Skip to content

Commit 57c2c29

Browse files
committed
fix: remove exported reviouslyResolved interface
1 parent 2c3dc2c commit 57c2c29

File tree

1 file changed

+69
-42
lines changed

1 file changed

+69
-42
lines changed
Lines changed: 69 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
1-
import { Credentials, Provider, RequestSigner, HashConstructor, RetryDecider, DelayDecider, UrlParser, Protocol, HttpOptions } from "@aws-sdk/types";
2-
import { SignatureV4 } from '@aws-sdk/signature-v4';
3-
import { HttpEndpoint, HttpHandler, HttpRequest, HttpResponse } from '@aws-sdk/protocol-http';
1+
import {
2+
Credentials,
3+
Provider,
4+
RequestSigner,
5+
HashConstructor,
6+
RetryDecider,
7+
DelayDecider,
8+
UrlParser,
9+
Protocol,
10+
HttpOptions
11+
} from "@aws-sdk/types";
12+
import { SignatureV4 } from "@aws-sdk/signature-v4";
13+
import {
14+
HttpEndpoint,
15+
HttpHandler,
16+
HttpRequest,
17+
HttpResponse
18+
} from "@aws-sdk/protocol-http";
419

520
export function normalizeProvider<T>(input: T | Provider<T>): Provider<T> {
621
if (typeof input === "object") {
@@ -21,7 +36,7 @@ export function normalizeEndpoint(
2136
const promisified = Promise.resolve(endpoint);
2237
return () => promisified;
2338
}
24-
return endpoint!
39+
return endpoint!;
2540
}
2641

2742
export namespace AwsAuthConfiguration {
@@ -31,7 +46,7 @@ export namespace AwsAuthConfiguration {
3146
signingEscapePath?: boolean;
3247
}
3348
interface PreviouslyResolved {
34-
credentialDefaultProvider: (input: any) => Provider<Credentials>
49+
credentialDefaultProvider: (input: any) => Provider<Credentials>;
3550
region: string | Provider<string>;
3651
signingName: string;
3752
sha256: HashConstructor;
@@ -41,8 +56,11 @@ export namespace AwsAuthConfiguration {
4156
signer: RequestSigner;
4257
signingEscapePath: boolean;
4358
};
44-
export function resolve<T>(input: T & Input & PreviouslyResolved): T & Resolved {
45-
let credentials = input.credentials || input.credentialDefaultProvider(input as any);
59+
export function resolve<T>(
60+
input: T & Input & PreviouslyResolved
61+
): T & Resolved {
62+
let credentials =
63+
input.credentials || input.credentialDefaultProvider(input as any);
4664
const normalizedCreds = normalizeProvider(credentials);
4765
const signingEscapePath = input.signingEscapePath || false;
4866
return {
@@ -56,95 +74,104 @@ export namespace AwsAuthConfiguration {
5674
sha256: input.sha256,
5775
uriEscapePath: signingEscapePath
5876
})
59-
}
77+
};
6078
}
6179
}
6280

6381
export namespace RegionConfiguration {
6482
export interface Input {
65-
region?: string | Provider<string>
83+
region?: string | Provider<string>;
6684
}
6785
interface PreviouslyResolved {
68-
regionDefaultProvider: (input: any) => Provider<string>
86+
regionDefaultProvider: (input: any) => Provider<string>;
6987
}
7088
export interface Resolved {
71-
region: Provider<string>
89+
region: Provider<string>;
7290
}
73-
export function resolve<T>(input: T & Input & PreviouslyResolved): T & Resolved {
91+
export function resolve<T>(
92+
input: T & Input & PreviouslyResolved
93+
): T & Resolved {
7494
let region = input.region || input.regionDefaultProvider(input as any);
7595
return {
7696
...input,
7797
region: normalizeProvider(region)
78-
}
98+
};
7999
}
80100
}
81101

82102
export namespace RetryConfig {
83103
export interface Input {
84-
maxRetries?: number,
85-
retryDecider?: RetryDecider,
86-
delayDecider?: DelayDecider,
104+
maxRetries?: number;
105+
retryDecider?: RetryDecider;
106+
delayDecider?: DelayDecider;
87107
}
88108
export interface Resolved {
89-
maxRetries: number,
90-
retryDecider?: RetryDecider,
91-
delayDecider?: DelayDecider,
109+
maxRetries: number;
110+
retryDecider?: RetryDecider;
111+
delayDecider?: DelayDecider;
92112
}
93113
export function resolve<T>(input: T & Input): T & Resolved {
94114
return {
95115
...input,
96116
maxRetries: input.maxRetries === undefined ? 3 : input.maxRetries
97-
}
117+
};
98118
}
99119
}
100120

101121
export namespace EndpointsConfig {
102122
export interface Input {
103-
endpoint?: string | HttpEndpoint | Provider<HttpEndpoint>,
104-
endpointProvider?: any,
105-
tls?: boolean,
123+
endpoint?: string | HttpEndpoint | Provider<HttpEndpoint>;
124+
endpointProvider?: any;
125+
tls?: boolean;
106126
}
107127
interface PreviouslyResolved {
108-
urlParser: UrlParser,
109-
region: Provider<string>,
110-
service: string
128+
urlParser: UrlParser;
129+
region: Provider<string>;
130+
service: string;
111131
}
112132
export interface Resolved extends Required<Input> {
113133
endpoint: Provider<HttpEndpoint>;
114134
}
115-
export function resolve<T>(input: T & Input & PreviouslyResolved): T & Resolved {
135+
export function resolve<T>(
136+
input: T & Input & PreviouslyResolved
137+
): T & Resolved {
116138
const tls = input.tls || true;
117139
const defaultProvider = (tls: boolean, region: string) => ({
118140
protocol: tls ? "https:" : "http:",
119141
path: "/",
120142
hostname: `${input.service}.${region}.amazonaws.com`
121143
});
122-
const endpointProvider = input.endpointProvider || defaultProvider
123-
let endpoint: Provider<HttpEndpoint> = input.endpoint ?
124-
normalizeEndpoint(input.endpoint) :
125-
() => input.region().then(region => endpointProvider(tls, region));
144+
const endpointProvider = input.endpointProvider || defaultProvider;
145+
let endpoint: Provider<HttpEndpoint> = input.endpoint
146+
? normalizeEndpoint(input.endpoint, input.urlParser)
147+
: () => input.region().then(region => endpointProvider(tls, region));
126148
return {
127149
...input,
128150
endpointProvider,
129151
endpoint,
130152
tls
131-
}
153+
};
132154
}
133155
}
134156

135157
export namespace ProtocolConfig {
136158
export interface Input {
137-
protocol?: Protocol<any, any>
159+
protocol?: Protocol<any, any>;
138160
}
139-
export interface PreviouslyResolved {
140-
httpHandler: HttpHandler,
141-
protocolDefaultProvider: (handler: HttpHandler) => Protocol<HttpRequest, HttpResponse, HttpOptions>
142-
}
143-
export type Resolved = Required<Input>
144-
export function resolve<T>(input: T & Input & PreviouslyResolved): T & Resolved {
161+
interface PreviouslyResolved {
162+
httpHandler: HttpHandler;
163+
protocolDefaultProvider: (
164+
handler: HttpHandler
165+
) => Protocol<HttpRequest, HttpResponse, HttpOptions>;
166+
}
167+
export type Resolved = Required<Input>;
168+
export function resolve<T>(
169+
input: T & Input & PreviouslyResolved
170+
): T & Resolved {
145171
return {
146172
...input,
147-
protocol: input.protocol || input.protocolDefaultProvider(input.httpHandler)
148-
}
173+
protocol:
174+
input.protocol || input.protocolDefaultProvider(input.httpHandler)
175+
};
149176
}
150-
}
177+
}

0 commit comments

Comments
 (0)