Skip to content

Commit 9ca8bae

Browse files
authored
test(credential-provider-node): fix tests related to defaultProvider chain (#6285)
1 parent d1105e3 commit 9ca8bae

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

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

+11-4
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,17 @@ describe(defaultProvider.name, () => {
4949
const mockTokenFileFn = jest.fn().mockImplementation(() => credentials());
5050
const mockRemoteProviderFn = jest.fn().mockImplementation(() => finalCredentials());
5151

52+
const ORIGINAL_ENV = {
53+
...process.env,
54+
};
55+
5256
beforeEach(() => {
57+
process.env = {
58+
...ORIGINAL_ENV,
59+
};
60+
delete process.env.AWS_PROFILE;
61+
delete process.env.AWS_ACCESS_KEY_ID;
62+
delete process.env.AWS_SECRET_ACCESS_KEY;
5363
[
5464
[fromEnv, mockEnvFn],
5565
[fromSSO, mockSsoFn],
@@ -64,6 +74,7 @@ describe(defaultProvider.name, () => {
6474

6575
afterEach(async () => {
6676
jest.clearAllMocks();
77+
process.env = ORIGINAL_ENV;
6778
});
6879

6980
describe("without fromEnv", () => {
@@ -102,9 +113,7 @@ describe(defaultProvider.name, () => {
102113
});
103114

104115
it(`if env['${ENV_PROFILE}'] is set`, async () => {
105-
const ORIGINAL_ENV = process.env;
106116
process.env = {
107-
...ORIGINAL_ENV,
108117
[ENV_PROFILE]: "envProfile",
109118
};
110119

@@ -117,8 +126,6 @@ describe(defaultProvider.name, () => {
117126
expect(fromFn).toHaveBeenCalledWith(mockInitWithoutProfile);
118127
}
119128
expect(fromSSO).not.toHaveBeenCalled();
120-
121-
process.env = ORIGINAL_ENV;
122129
});
123130
});
124131

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ export const defaultProvider = (init: DefaultProviderInit = {}): MemoizedProvide
8484
);
8585
multipleCredentialSourceWarningEmitted = true;
8686
}
87-
throw new CredentialsProviderError("AWS_PROFILE is set, skipping fromEnv provider.", {
88-
logger: init.logger,
89-
tryNextLink: true,
90-
});
9187
}
88+
throw new CredentialsProviderError("AWS_PROFILE is set, skipping fromEnv provider.", {
89+
logger: init.logger,
90+
tryNextLink: true,
91+
});
9292
}
9393
init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromEnv");
9494
return fromEnv(init)();

0 commit comments

Comments
 (0)