Skip to content

Commit 56b206d

Browse files
committed
feat: add sharedConfig file for un-runtime default values
1 parent f04fb7a commit 56b206d

File tree

5 files changed

+24
-31
lines changed

5 files changed

+24
-31
lines changed

clients/client-rds-data/RdsDataServiceClient.ts

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
RollbackTransactionRequest,
1313
RollbackTransactionResponse
1414
} from "./models/index";
15-
import { RDSRuntimeConfiguration } from "./runtimeConfig";
15+
import { RDSDefaultValues } from "./runtimeConfig";
1616
import {
1717
Credentials,
1818
Provider,
@@ -73,25 +73,13 @@ export type ServiceOutputTypes =
7373
| ExecuteStatementResponse
7474
| BatchExecuteStatementResponse;
7575

76-
export interface RDSDataSharedConfig {
77-
/**
78-
* The function that will be used to populate serializing protocol
79-
*/
80-
protocol?: string;
81-
/**
82-
* The service name with which to sign requests.
83-
*/
76+
export interface RDSDataDefaults
77+
extends Partial<SmithyResolvedConfiguration<__HttpOptions>> {
78+
// protocol?: string;
8479
signingName?: string;
85-
/**
86-
* The service name with which to construct endpoints.
87-
*/
80+
// apiVersion?: string;
8881
service?: string;
89-
/**
90-
* Major version of the API model in YYYY-MM-DD format
91-
*/
92-
apiVersion?: string;
93-
}
94-
export interface RDSDataRuntimeDependencies {
82+
9583
/**
9684
* The HTTP handler to use. Fetch in browser and Https in Nodejs
9785
*/
@@ -153,8 +141,7 @@ export interface RDSDataRuntimeDependencies {
153141
defaultUserAgent?: string;
154142
}
155143

156-
export type RdsDataServiceConfig = RDSDataSharedConfig &
157-
RDSDataRuntimeDependencies &
144+
export type RdsDataServiceConfig = RDSDataDefaults &
158145
AwsAuthInputConfig &
159146
RegionInputConfig &
160147
RetryInputConfig &
@@ -164,8 +151,7 @@ export type RdsDataServiceConfig = RDSDataSharedConfig &
164151
export type RdsDataServiceResolvedConfig = SmithyResolvedConfiguration<
165152
__HttpOptions
166153
> &
167-
Required<RDSDataSharedConfig> &
168-
Required<RDSDataRuntimeDependencies> &
154+
Required<RDSDataDefaults> &
169155
AwsAuthResolvedConfig &
170156
RegionResolvedConfig &
171157
RetryResolvedConfig &
@@ -182,11 +168,7 @@ export class RdsDataService extends SmithyClient<
182168

183169
constructor(configuration: RdsDataServiceConfig) {
184170
const _config_0 = {
185-
apiVersion: "2018-08-01",
186-
protocol: "aws.rest-json-1.1",
187-
signingName: "rds-data", //TODO: signing name and service should not be generated as they will be populated by RIP
188-
service: "rds-data",
189-
...RDSRuntimeConfiguration,
171+
...RDSDefaultValues,
190172
...configuration
191173
};
192174
let _config_1 = resolveRegionConfig(_config_0);

clients/client-rds-data/runtimeConfig.browser.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-browser";
88
import { fromBase64, toBase64 } from "@aws-sdk/util-base64-browser";
99
import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
1010
import { name, version } from "./package.json";
11-
import { RDSDataRuntimeDependencies } from "./RdsDataServiceClient";
11+
import { RDSDataDefaults } from "./RdsDataServiceClient";
12+
import { RDSDataSharedConfigDefaults } from "./sharedConfig";
1213

13-
export const RDSRuntimeConfiguration: Required<RDSDataRuntimeDependencies> = {
14+
export const RDSRuntimeConfiguration: Required<RDSDataDefaults> = {
15+
...RDSDataSharedConfigDefaults,
1416
requestHandler: new FetchHttpHandler(),
1517
sha256: Sha256,
1618
credentialDefaultProvider: invalidFunction("Credential is missing") as any,

clients/client-rds-data/runtimeConfig.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-node";
99
import { fromBase64, toBase64 } from "@aws-sdk/util-base64-node";
1010
import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
1111
import { name, version } from "./package.json";
12-
import { RDSDataRuntimeDependencies } from "./RdsDataServiceClient";
12+
import { RDSDataDefaults } from "./RdsDataServiceClient";
13+
import { RDSDataSharedConfig } from "./sharedConfig";
1314

14-
export const RDSRuntimeConfiguration: Required<RDSDataRuntimeDependencies> = {
15+
export const RDSDefaultValues: Required<RDSDataDefaults> = {
16+
...RDSDataSharedConfig,
1517
requestHandler: new NodeHttpHandler(),
1618
sha256: Hash.bind(null, "sha256"),
1719
credentialDefaultProvider,
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export const RDSDataSharedConfigDefaults = {
2+
protocol: "rds-data",
3+
signingName: "rds-data",
4+
apiVersion: "2018-08-01",
5+
service: "rds-data"
6+
};

packages/smithy-client/src/client.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
export interface SmithyConfiguration<HandlerOptions> {
1010
requestHandler: RequestHandler<any, any, HandlerOptions>;
1111
readonly apiVersion: string;
12+
readonly protocol: string;
1213
}
1314

1415
export type SmithyResolvedConfiguration<HandlerOptions> = SmithyConfiguration<

0 commit comments

Comments
 (0)