Skip to content

Commit f8bee3d

Browse files
authored
chore(credential-provider-node): do not set profile from env (#3481)
1 parent 212c866 commit f8bee3d

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ describe(defaultProvider.name, () => {
9494
expect(loadSharedConfigFiles).not.toHaveBeenCalled();
9595
});
9696

97-
it(`reads profile from env['${ENV_PROFILE}'], if not provided in init`, async () => {
97+
it(`if env['${ENV_PROFILE}'] is set`, async () => {
9898
const ORIGINAL_ENV = process.env;
9999
process.env = {
100100
...ORIGINAL_ENV,
@@ -107,7 +107,7 @@ describe(defaultProvider.name, () => {
107107

108108
expect(fromEnv).not.toHaveBeenCalled();
109109
for (const fromFn of [fromSSO, fromIni, fromProcess, fromTokenFile, remoteProvider]) {
110-
expect(fromFn).toHaveBeenCalledWith({ ...mockInit, profile: process.env[ENV_PROFILE] });
110+
expect(fromFn).toHaveBeenCalledWith(mockInitWithoutProfile);
111111
}
112112

113113
process.env = ORIGINAL_ENV;

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

+13-21
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,19 @@ import { remoteProvider } from "./remoteProvider";
4646
*/
4747
export const defaultProvider = (
4848
init: FromIniInit & RemoteProviderInit & FromProcessInit & FromSSOInit & FromTokenFileInit = {}
49-
): MemoizedProvider<Credentials> => {
50-
const options = {
51-
profile: process.env[ENV_PROFILE],
52-
...init,
53-
};
54-
55-
const providerChain = chain(
56-
...(options.profile ? [] : [fromEnv()]),
57-
fromSSO(options),
58-
fromIni(options),
59-
fromProcess(options),
60-
fromTokenFile(options),
61-
remoteProvider(options),
62-
async () => {
63-
throw new CredentialsProviderError("Could not load credentials from any providers", false);
64-
}
65-
);
66-
67-
return memoize(
68-
providerChain,
49+
): MemoizedProvider<Credentials> =>
50+
memoize(
51+
chain(
52+
...(init.profile || process.env[ENV_PROFILE] ? [] : [fromEnv()]),
53+
fromSSO(init),
54+
fromIni(init),
55+
fromProcess(init),
56+
fromTokenFile(init),
57+
remoteProvider(init),
58+
async () => {
59+
throw new CredentialsProviderError("Could not load credentials from any providers", false);
60+
}
61+
),
6962
(credentials) => credentials.expiration !== undefined && credentials.expiration.getTime() - Date.now() < 300000,
7063
(credentials) => credentials.expiration !== undefined
7164
);
72-
};

0 commit comments

Comments
 (0)