Skip to content

Commit c411f8d

Browse files
trivikrtrivikr
authored
chore(credential-providers): remove dependency on util-credentials (#3423)
1 parent a2ba7a3 commit c411f8d

File tree

15 files changed

+34
-45
lines changed

15 files changed

+34
-45
lines changed

‎packages/credential-provider-ini/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"@aws-sdk/property-provider": "*",
3131
"@aws-sdk/shared-ini-file-loader": "*",
3232
"@aws-sdk/types": "*",
33-
"@aws-sdk/util-credentials": "*",
3433
"tslib": "^2.3.0"
3534
},
3635
"devDependencies": {

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import { AssumeRoleWithWebIdentityParams } from "@aws-sdk/credential-provider-web-identity";
2-
import { CredentialProvider, Credentials } from "@aws-sdk/types";
3-
import { getMasterProfileName, parseKnownFiles } from "@aws-sdk/util-credentials";
1+
import { getProfileName, parseKnownFiles } from "@aws-sdk/shared-ini-file-loader";
2+
import { Credentials } from "@aws-sdk/types";
43

54
import { fromIni } from "./fromIni";
6-
import { AssumeRoleParams } from "./resolveAssumeRoleCredentials";
75
import { resolveProfileData } from "./resolveProfileData";
86

9-
jest.mock("@aws-sdk/util-credentials");
7+
jest.mock("@aws-sdk/shared-ini-file-loader");
108
jest.mock("./resolveProfileData");
119

1210
describe(fromIni.name, () => {
@@ -17,7 +15,7 @@ describe(fromIni.name, () => {
1715

1816
beforeEach(() => {
1917
(parseKnownFiles as jest.Mock).mockResolvedValue(mockProfiles);
20-
(getMasterProfileName as jest.Mock).mockReturnValue(mockMasterProfileName);
18+
(getProfileName as jest.Mock).mockReturnValue(mockMasterProfileName);
2119
});
2220

2321
afterEach(() => {
@@ -34,7 +32,7 @@ describe(fromIni.name, () => {
3432
expect(error).toStrictEqual(expectedError);
3533
}
3634
expect(parseKnownFiles).toHaveBeenCalledWith(mockInit);
37-
expect(getMasterProfileName).not.toHaveBeenCalled();
35+
expect(getProfileName).not.toHaveBeenCalled();
3836
expect(resolveProfileData).not.toHaveBeenCalled();
3937
});
4038

@@ -48,7 +46,7 @@ describe(fromIni.name, () => {
4846
expect(error).toStrictEqual(expectedError);
4947
}
5048
expect(parseKnownFiles).toHaveBeenCalledWith(mockInit);
51-
expect(getMasterProfileName).toHaveBeenCalledWith(mockInit);
49+
expect(getProfileName).toHaveBeenCalledWith(mockInit);
5250
expect(resolveProfileData).toHaveBeenCalledWith(mockMasterProfileName, mockProfiles, mockInit);
5351
});
5452

@@ -61,7 +59,7 @@ describe(fromIni.name, () => {
6159
const receivedCreds = await fromIni(mockInit)();
6260
expect(receivedCreds).toStrictEqual(expectedCreds);
6361
expect(parseKnownFiles).toHaveBeenCalledWith(mockInit);
64-
expect(getMasterProfileName).toHaveBeenCalledWith(mockInit);
62+
expect(getProfileName).toHaveBeenCalledWith(mockInit);
6563
expect(resolveProfileData).toHaveBeenCalledWith(mockMasterProfileName, mockProfiles, mockInit);
6664
});
6765
});

‎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 { AssumeRoleWithWebIdentityParams } from "@aws-sdk/credential-provider-web-identity";
2+
import { getProfileName, parseKnownFiles, SourceProfileInit } from "@aws-sdk/shared-ini-file-loader";
23
import { CredentialProvider, Credentials } from "@aws-sdk/types";
3-
import { getMasterProfileName, parseKnownFiles, SourceProfileInit } from "@aws-sdk/util-credentials";
44

55
import { AssumeRoleParams } from "./resolveAssumeRoleCredentials";
66
import { resolveProfileData } from "./resolveProfileData";
@@ -43,5 +43,5 @@ export const fromIni =
4343
(init: FromIniInit = {}): CredentialProvider =>
4444
async () => {
4545
const profiles = await parseKnownFiles(init);
46-
return resolveProfileData(getMasterProfileName(init), profiles, init);
46+
return resolveProfileData(getProfileName(init), profiles, init);
4747
};

‎packages/credential-provider-ini/src/resolveAssumeRoleCredentials.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { CredentialsProviderError } from "@aws-sdk/property-provider";
2-
import { getMasterProfileName } from "@aws-sdk/util-credentials";
2+
import { getProfileName } from "@aws-sdk/shared-ini-file-loader";
33

44
import { isAssumeRoleProfile, resolveAssumeRoleCredentials } from "./resolveAssumeRoleCredentials";
55
import { resolveCredentialSource } from "./resolveCredentialSource";
66
import { resolveProfileData } from "./resolveProfileData";
77

8-
jest.mock("@aws-sdk/util-credentials");
8+
jest.mock("@aws-sdk/shared-ini-file-loader");
99
jest.mock("./resolveCredentialSource");
1010
jest.mock("./resolveProfileData");
1111

@@ -112,7 +112,7 @@ describe(resolveAssumeRoleCredentials.name, () => {
112112
});
113113

114114
beforeEach(() => {
115-
(getMasterProfileName as jest.Mock).mockReturnValue(mockProfileName);
115+
(getProfileName as jest.Mock).mockReturnValue(mockProfileName);
116116
(resolveProfileData as jest.Mock).mockResolvedValue(mockSourceCredsFromProfile);
117117
(resolveCredentialSource as jest.Mock).mockReturnValue(() => Promise.resolve(mockSourceCredsFromCredential));
118118
});

‎packages/credential-provider-ini/src/resolveAssumeRoleCredentials.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { CredentialsProviderError } from "@aws-sdk/property-provider";
2+
import { getProfileName } from "@aws-sdk/shared-ini-file-loader";
23
import { ParsedIniData, Profile } from "@aws-sdk/types";
3-
import { getMasterProfileName } from "@aws-sdk/util-credentials";
44

55
import { FromIniInit } from "./fromIni";
66
import { resolveCredentialSource } from "./resolveCredentialSource";
@@ -83,7 +83,7 @@ export const resolveAssumeRoleCredentials = async (
8383
if (source_profile && source_profile in visitedProfiles) {
8484
throw new CredentialsProviderError(
8585
`Detected a cycle attempting to resolve credentials for profile` +
86-
` ${getMasterProfileName(options)}. Profiles visited: ` +
86+
` ${getProfileName(options)}. Profiles visited: ` +
8787
Object.keys(visitedProfiles).join(", "),
8888
false
8989
);

‎packages/credential-provider-node/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"@aws-sdk/property-provider": "*",
3636
"@aws-sdk/shared-ini-file-loader": "*",
3737
"@aws-sdk/types": "*",
38-
"@aws-sdk/util-credentials": "*",
3938
"tslib": "^2.3.0"
4039
},
4140
"devDependencies": {

‎packages/credential-provider-node/src/defaultProvider.spec.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import { fromEnv } from "@aws-sdk/credential-provider-env";
2-
import { RemoteProviderInit } from "@aws-sdk/credential-provider-imds";
3-
import { fromIni, FromIniInit } from "@aws-sdk/credential-provider-ini";
4-
import { fromProcess, FromProcessInit } from "@aws-sdk/credential-provider-process";
5-
import { fromSSO, FromSSOInit } from "@aws-sdk/credential-provider-sso";
6-
import { fromTokenFile, FromTokenFileInit } from "@aws-sdk/credential-provider-web-identity";
2+
import { fromIni } from "@aws-sdk/credential-provider-ini";
3+
import { fromProcess } from "@aws-sdk/credential-provider-process";
4+
import { fromSSO } from "@aws-sdk/credential-provider-sso";
5+
import { fromTokenFile } from "@aws-sdk/credential-provider-web-identity";
76
import { chain, CredentialsProviderError, memoize } from "@aws-sdk/property-provider";
8-
import { loadSharedConfigFiles } from "@aws-sdk/shared-ini-file-loader";
9-
import { CredentialProvider } from "@aws-sdk/types";
10-
import { ENV_PROFILE } from "@aws-sdk/util-credentials";
7+
import { ENV_PROFILE, loadSharedConfigFiles } from "@aws-sdk/shared-ini-file-loader";
118

129
import { defaultProvider } from "./defaultProvider";
1310
import { remoteProvider } from "./remoteProvider";

‎packages/credential-provider-node/src/defaultProvider.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ import { fromProcess, FromProcessInit } from "@aws-sdk/credential-provider-proce
55
import { fromSSO, FromSSOInit } from "@aws-sdk/credential-provider-sso";
66
import { fromTokenFile, FromTokenFileInit } from "@aws-sdk/credential-provider-web-identity";
77
import { chain, CredentialsProviderError, memoize } from "@aws-sdk/property-provider";
8-
import { loadSharedConfigFiles } from "@aws-sdk/shared-ini-file-loader";
8+
import { ENV_PROFILE, loadSharedConfigFiles } from "@aws-sdk/shared-ini-file-loader";
99
import { CredentialProvider } from "@aws-sdk/types";
10-
import { ENV_PROFILE } from "@aws-sdk/util-credentials";
1110

1211
import { remoteProvider } from "./remoteProvider";
1312

‎packages/credential-provider-process/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"@aws-sdk/property-provider": "*",
2727
"@aws-sdk/shared-ini-file-loader": "*",
2828
"@aws-sdk/types": "*",
29-
"@aws-sdk/util-credentials": "*",
3029
"tslib": "^2.3.0"
3130
},
3231
"devDependencies": {

‎packages/credential-provider-process/src/fromProcess.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { getProfileName, parseKnownFiles } from "@aws-sdk/shared-ini-file-loader";
12
import { Credentials } from "@aws-sdk/types";
2-
import { getMasterProfileName, parseKnownFiles } from "@aws-sdk/util-credentials";
33

44
import { fromProcess } from "./fromProcess";
55
import { resolveProcessCredentials } from "./resolveProcessCredentials";
66

7-
jest.mock("@aws-sdk/util-credentials");
7+
jest.mock("@aws-sdk/shared-ini-file-loader");
88
jest.mock("./resolveProcessCredentials");
99

1010
describe(fromProcess.name, () => {
@@ -15,7 +15,7 @@ describe(fromProcess.name, () => {
1515

1616
beforeEach(() => {
1717
(parseKnownFiles as jest.Mock).mockResolvedValue(mockProfiles);
18-
(getMasterProfileName as jest.Mock).mockReturnValue(mockMasterProfileName);
18+
(getProfileName as jest.Mock).mockReturnValue(mockMasterProfileName);
1919
});
2020

2121
afterEach(() => {
@@ -32,7 +32,7 @@ describe(fromProcess.name, () => {
3232
expect(error).toStrictEqual(expectedError);
3333
}
3434
expect(parseKnownFiles).toHaveBeenCalledWith(mockInit);
35-
expect(getMasterProfileName).not.toHaveBeenCalled();
35+
expect(getProfileName).not.toHaveBeenCalled();
3636
expect(resolveProcessCredentials).not.toHaveBeenCalled();
3737
});
3838

@@ -46,7 +46,7 @@ describe(fromProcess.name, () => {
4646
expect(error).toStrictEqual(expectedError);
4747
}
4848
expect(parseKnownFiles).toHaveBeenCalledWith(mockInit);
49-
expect(getMasterProfileName).toHaveBeenCalledWith(mockInit);
49+
expect(getProfileName).toHaveBeenCalledWith(mockInit);
5050
expect(resolveProcessCredentials).toHaveBeenCalledWith(mockMasterProfileName, mockProfiles);
5151
});
5252

@@ -59,7 +59,7 @@ describe(fromProcess.name, () => {
5959
const receivedCreds = await fromProcess(mockInit)();
6060
expect(receivedCreds).toStrictEqual(expectedCreds);
6161
expect(parseKnownFiles).toHaveBeenCalledWith(mockInit);
62-
expect(getMasterProfileName).toHaveBeenCalledWith(mockInit);
62+
expect(getProfileName).toHaveBeenCalledWith(mockInit);
6363
expect(resolveProcessCredentials).toHaveBeenCalledWith(mockMasterProfileName, mockProfiles);
6464
});
6565
});

‎packages/credential-provider-process/src/fromProcess.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { getProfileName, parseKnownFiles, SourceProfileInit } from "@aws-sdk/shared-ini-file-loader";
12
import { CredentialProvider } from "@aws-sdk/types";
2-
import { getMasterProfileName, parseKnownFiles, SourceProfileInit } from "@aws-sdk/util-credentials";
33

44
import { resolveProcessCredentials } from "./resolveProcessCredentials";
55

@@ -13,5 +13,5 @@ export const fromProcess =
1313
(init: FromProcessInit = {}): CredentialProvider =>
1414
async () => {
1515
const profiles = await parseKnownFiles(init);
16-
return resolveProcessCredentials(getMasterProfileName(init), profiles);
16+
return resolveProcessCredentials(getProfileName(init), profiles);
1717
};

‎packages/credential-provider-sso/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"@aws-sdk/property-provider": "*",
2828
"@aws-sdk/shared-ini-file-loader": "*",
2929
"@aws-sdk/types": "*",
30-
"@aws-sdk/util-credentials": "*",
3130
"tslib": "^2.3.0"
3231
},
3332
"devDependencies": {

‎packages/credential-provider-sso/src/fromSSO.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { SSOClient } from "@aws-sdk/client-sso";
22
import { CredentialsProviderError } from "@aws-sdk/property-provider";
3-
import { getMasterProfileName, parseKnownFiles } from "@aws-sdk/util-credentials";
3+
import { getProfileName, parseKnownFiles } from "@aws-sdk/shared-ini-file-loader";
44

55
import { fromSSO } from "./fromSSO";
66
import { isSsoProfile } from "./isSsoProfile";
77
import { resolveSSOCredentials } from "./resolveSSOCredentials";
88
import { validateSsoProfile } from "./validateSsoProfile";
99

10-
jest.mock("@aws-sdk/util-credentials");
10+
jest.mock("@aws-sdk/shared-ini-file-loader");
1111
jest.mock("./isSsoProfile");
1212
jest.mock("./resolveSSOCredentials");
1313
jest.mock("./validateSsoProfile");
@@ -42,13 +42,13 @@ describe(fromSSO.name, () => {
4242

4343
beforeEach(() => {
4444
(parseKnownFiles as jest.Mock).mockResolvedValue(mockProfiles);
45-
(getMasterProfileName as jest.Mock).mockReturnValue(mockProfileName);
45+
(getProfileName as jest.Mock).mockReturnValue(mockProfileName);
4646
(isSsoProfile as unknown as jest.Mock).mockReturnValue(true);
4747
});
4848

4949
afterEach(() => {
5050
expect(parseKnownFiles).toHaveBeenCalledWith(mockInit);
51-
expect(getMasterProfileName).toHaveBeenCalledWith(mockInit);
51+
expect(getProfileName).toHaveBeenCalledWith(mockInit);
5252
expect(isSsoProfile).toHaveBeenCalledWith(mockSsoProfile);
5353
});
5454

‎packages/credential-provider-sso/src/fromSSO.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { SSOClient } from "@aws-sdk/client-sso";
22
import { CredentialsProviderError } from "@aws-sdk/property-provider";
3+
import { getProfileName, parseKnownFiles, SourceProfileInit } from "@aws-sdk/shared-ini-file-loader";
34
import { CredentialProvider } from "@aws-sdk/types";
4-
import { getMasterProfileName, parseKnownFiles, SourceProfileInit } from "@aws-sdk/util-credentials";
55

66
import { isSsoProfile } from "./isSsoProfile";
77
import { resolveSSOCredentials } from "./resolveSSOCredentials";
@@ -44,7 +44,7 @@ export const fromSSO =
4444
if (!ssoStartUrl && !ssoAccountId && !ssoRegion && !ssoRoleName) {
4545
// Load the SSO config from shared AWS config file.
4646
const profiles = await parseKnownFiles(init);
47-
const profileName = getMasterProfileName(init);
47+
const profileName = getProfileName(init);
4848
const profile = profiles[profileName];
4949

5050
if (!isSsoProfile(profile)) {

‎packages/credential-providers/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
"@aws-sdk/property-provider": "*",
4040
"@aws-sdk/shared-ini-file-loader": "*",
4141
"@aws-sdk/types": "*",
42-
"@aws-sdk/util-credentials": "*",
4342
"tslib": "^2.3.0"
4443
},
4544
"devDependencies": {

0 commit comments

Comments
 (0)