Skip to content

Commit 90d7122

Browse files
committed
feat(credential-providers): rename types
1 parent 8c3671a commit 90d7122

File tree

9 files changed

+29
-27
lines changed

9 files changed

+29
-27
lines changed

packages/credential-provider-cognito-identity/src/fromCognitoIdentity.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { AwsIdentityProperties, CredentialProviderOptions, RegionalIdentityProvider } from "@aws-sdk/types";
1+
import type { AwsIdentityProperties, CredentialProviderOptions, RuntimeConfigIdentityProvider } from "@aws-sdk/types";
22
import { CredentialsProviderError } from "@smithy/property-provider";
33
import type { AwsCredentialIdentity, Logger } from "@smithy/types";
44

@@ -18,7 +18,7 @@ export interface CognitoIdentityCredentials extends AwsCredentialIdentity {
1818
/**
1919
* @internal
2020
*/
21-
export type CognitoIdentityCredentialProvider = RegionalIdentityProvider<CognitoIdentityCredentials>;
21+
export type CognitoIdentityCredentialProvider = RuntimeConfigIdentityProvider<CognitoIdentityCredentials>;
2222

2323
/**
2424
* @internal

packages/credential-provider-ini/src/fromIni.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { AssumeRoleWithWebIdentityParams } from "@aws-sdk/credential-provider-web-identity";
22
import type { CredentialProviderOptions } from "@aws-sdk/types";
3-
import type { RegionalAwsCredentialIdentityProvider } from "@aws-sdk/types";
3+
import type { RuntimeConfigAwsCredentialIdentityProvider } from "@aws-sdk/types";
44
import { getProfileName, parseKnownFiles, SourceProfileInit } from "@smithy/shared-ini-file-loader";
55
import type { AwsCredentialIdentity, Pluggable } from "@smithy/types";
66

@@ -56,7 +56,7 @@ export interface FromIniInit extends SourceProfileInit, CredentialProviderOption
5656
* role assumption and multi-factor authentication.
5757
*/
5858
export const fromIni =
59-
(_init: FromIniInit = {}): RegionalAwsCredentialIdentityProvider =>
59+
(_init: FromIniInit = {}): RuntimeConfigAwsCredentialIdentityProvider =>
6060
async ({ callerClientConfig } = {}) => {
6161
const init: FromIniInit = {
6262
..._init,

packages/credential-provider-web-identity/src/fromWebToken.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type {
22
AwsIdentityProperties,
33
CredentialProviderOptions,
4-
RegionalAwsCredentialIdentityProvider,
4+
RuntimeConfigAwsCredentialIdentityProvider,
55
} from "@aws-sdk/types";
66
import type { AwsCredentialIdentity, Pluggable } from "@smithy/types";
77

@@ -155,7 +155,7 @@ export interface FromWebTokenInit
155155
* @internal
156156
*/
157157
export const fromWebToken =
158-
(init: FromWebTokenInit): RegionalAwsCredentialIdentityProvider =>
158+
(init: FromWebTokenInit): RuntimeConfigAwsCredentialIdentityProvider =>
159159
async (awsIdentityProperties?: AwsIdentityProperties) => {
160160
init.logger?.debug("@aws-sdk/credential-provider-web-identity - fromWebToken");
161161
const { roleArn, roleSessionName, webIdentityToken, providerId, policyArns, policy, durationSeconds } = init;

packages/credential-providers/src/createCredentialChain.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RegionalAwsCredentialIdentityProvider } from "@aws-sdk/types";
1+
import { RuntimeConfigAwsCredentialIdentityProvider } from "@aws-sdk/types";
22
import { ProviderError } from "@smithy/property-provider";
33
import { AwsCredentialIdentity, AwsCredentialIdentityProvider } from "@smithy/types";
44
import { describe, expect, test as it } from "vitest";
@@ -82,7 +82,7 @@ describe(createCredentialChain.name, () => {
8282
});
8383

8484
it("is compatible with contextual-region-aware credential providers", async () => {
85-
const provider: RegionalAwsCredentialIdentityProvider = async ({ callerClientConfig } = {}) => {
85+
const provider: RuntimeConfigAwsCredentialIdentityProvider = async ({ callerClientConfig } = {}) => {
8686
return {
8787
accessKeyId: "",
8888
secretAccessKey: "",

packages/credential-providers/src/createCredentialChain.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type {
22
AwsIdentityProperties,
3-
RegionalAwsCredentialIdentityProvider,
4-
RegionalIdentityProvider,
3+
RuntimeConfigAwsCredentialIdentityProvider,
4+
RuntimeConfigIdentityProvider,
55
} from "@aws-sdk/types";
66
import { ProviderError } from "@smithy/property-provider";
77
import type { AwsCredentialIdentityProvider } from "@smithy/types";
@@ -57,8 +57,8 @@ type Mutable<Type> = {
5757
* providers in sequence until one succeeds or all fail.
5858
*/
5959
export const createCredentialChain = (
60-
...credentialProviders: RegionalAwsCredentialIdentityProvider[]
61-
): RegionalAwsCredentialIdentityProvider & CustomCredentialChainOptions => {
60+
...credentialProviders: RuntimeConfigAwsCredentialIdentityProvider[]
61+
): RuntimeConfigAwsCredentialIdentityProvider & CustomCredentialChainOptions => {
6262
let expireAfter = -1;
6363
const baseFunction = async (awsIdentityProperties?: AwsIdentityProperties) => {
6464
const credentials = await propertyProviderChain(...credentialProviders)(awsIdentityProperties);
@@ -85,7 +85,7 @@ export const createCredentialChain = (
8585
* @internal
8686
*/
8787
export const propertyProviderChain =
88-
<T>(...providers: Array<RegionalIdentityProvider<T>>): RegionalIdentityProvider<T> =>
88+
<T>(...providers: Array<RuntimeConfigIdentityProvider<T>>): RuntimeConfigIdentityProvider<T> =>
8989
async (awsIdentityProperties?: AwsIdentityProperties) => {
9090
if (providers.length === 0) {
9191
throw new ProviderError("No providers in chain");

packages/credential-providers/src/fromIni.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { fromIni as _fromIni, FromIniInit } from "@aws-sdk/credential-provider-ini";
2-
import type { RegionalAwsCredentialIdentityProvider } from "@aws-sdk/types";
2+
import type { RuntimeConfigAwsCredentialIdentityProvider } from "@aws-sdk/types";
33

44
/**
55
* Creates a credential provider function that reads from a shared credentials file at `~/.aws/credentials` and a
@@ -40,7 +40,7 @@ import type { RegionalAwsCredentialIdentityProvider } from "@aws-sdk/types";
4040
* });
4141
* ```
4242
*/
43-
export const fromIni = (init: FromIniInit = {}): RegionalAwsCredentialIdentityProvider =>
43+
export const fromIni = (init: FromIniInit = {}): RuntimeConfigAwsCredentialIdentityProvider =>
4444
_fromIni({
4545
...init,
4646
});

packages/middleware-signing/src/awsAuthConfiguration.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { AwsCredentialIdentityProvider, RegionalAwsCredentialIdentityProvider } from "@aws-sdk/types";
1+
import type { AwsCredentialIdentityProvider, RuntimeConfigAwsCredentialIdentityProvider } from "@aws-sdk/types";
22
import { memoize } from "@smithy/property-provider";
33
import { SignatureV4, SignatureV4CryptoInit, SignatureV4Init } from "@smithy/signature-v4";
44
import {
@@ -293,7 +293,7 @@ export const resolveSigV4AuthConfig = <T>(
293293
* @deprecated only used in legacy auth.
294294
*/
295295
const normalizeCredentialProvider = (
296-
credentials: AwsCredentialIdentity | Provider<AwsCredentialIdentity> | RegionalAwsCredentialIdentityProvider
296+
credentials: AwsCredentialIdentity | Provider<AwsCredentialIdentity> | RuntimeConfigAwsCredentialIdentityProvider
297297
): MemoizedProvider<AwsCredentialIdentity> => {
298298
if (typeof credentials === "function") {
299299
return memoize(
@@ -315,7 +315,7 @@ const normalizeCredentialProvider = (
315315
* a binding to the config itself.
316316
*/
317317
const createConfigBoundCredentialProvider = (input: {
318-
credentials?: AwsCredentialIdentity | AwsCredentialIdentityProvider | RegionalAwsCredentialIdentityProvider;
318+
credentials?: AwsCredentialIdentity | AwsCredentialIdentityProvider | RuntimeConfigAwsCredentialIdentityProvider;
319319
credentialDefaultProvider: PreviouslyResolved["credentialDefaultProvider"];
320320
region: PreviouslyResolved["region"];
321321
}): AwsCredentialIdentityProvider => {
@@ -327,7 +327,7 @@ const createConfigBoundCredentialProvider = (input: {
327327
})
328328
);
329329
const normalizedCreds = async () =>
330-
(normalizedCredentialsProvider as RegionalAwsCredentialIdentityProvider)({
330+
(normalizedCredentialsProvider as RuntimeConfigAwsCredentialIdentityProvider)({
331331
callerClientConfig: {
332332
region: normalizeProvider(input.region),
333333
},

packages/token-providers/src/fromSso.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
AwsIdentityProperties,
33
CredentialProviderOptions,
4-
RegionalIdentityProvider,
4+
RuntimeConfigIdentityProvider,
55
TokenIdentity,
66
} from "@aws-sdk/types";
77
import { TokenProviderError } from "@smithy/property-provider";
@@ -36,7 +36,7 @@ export interface FromSsoInit extends SourceProfileInit, CredentialProviderOption
3636
* Creates a token provider that will read from SSO token cache or ssoOidc.createToken() call.
3737
*/
3838
export const fromSso =
39-
(_init: FromSsoInit = {}): RegionalIdentityProvider<TokenIdentity> =>
39+
(_init: FromSsoInit = {}): RuntimeConfigIdentityProvider<TokenIdentity> =>
4040
async (awsIdentityProperties?: AwsIdentityProperties) => {
4141
const init: FromSsoInit = {
4242
..._init,

packages/types/src/identity/AwsCredentialIdentity.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,25 @@ export interface AwsIdentityProperties {
1717
* @public
1818
*
1919
* Variation of {@link IdentityProvider} which accepts a contextual
20-
* client configuration that includes an AWS region.
20+
* client configuration that includes an AWS region and potentially other
21+
* configurable fields.
2122
*
22-
* Used to link a credential provider to a client region if it is being called
23+
* Used to link a credential provider to a client if it is being called
2324
* in the context of a client.
2425
*/
25-
export type RegionalIdentityProvider<T> = (awsIdentityProperties?: AwsIdentityProperties) => Promise<T>;
26+
export type RuntimeConfigIdentityProvider<T> = (awsIdentityProperties?: AwsIdentityProperties) => Promise<T>;
2627

2728
/**
2829
* @public
2930
*
3031
* Variation of {@link AwsCredentialIdentityProvider} which accepts a contextual
31-
* client configuration that includes an AWS region.
32+
* client configuration that includes an AWS region and potentially other
33+
* configurable fields.
3234
*
33-
* Used to link a credential provider to a client region if it is being called
35+
* Used to link a credential provider to a client if it is being called
3436
* in the context of a client.
3537
*/
36-
export type RegionalAwsCredentialIdentityProvider = RegionalIdentityProvider<AwsCredentialIdentity>;
38+
export type RuntimeConfigAwsCredentialIdentityProvider = RuntimeConfigIdentityProvider<AwsCredentialIdentity>;
3739

3840
/**
3941
* @public

0 commit comments

Comments
 (0)