Skip to content

Commit e49a0f1

Browse files
smilkurikuhe
authored andcommitted
feat(credential-providers): update the cyclic dependency
1 parent e6f1a31 commit e49a0f1

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe("fromAwsCliV2CompatibleProviderChain", () => {
99
let mockFromTokenFile: any;
1010
let mockFromSSO: any;
1111
let mockFromProcess: any;
12-
let mockRemoteProvider: any;
12+
let mockFromInstanceMetadata: any;
1313

1414
const mockLogger = {
1515
debug: vi.fn(),
@@ -79,14 +79,14 @@ describe("fromAwsCliV2CompatibleProviderChain", () => {
7979
fromProcess: () => mockFromProcess,
8080
}));
8181

82-
mockRemoteProvider = vi.fn(async () => {
82+
mockFromInstanceMetadata = vi.fn(async () => {
8383
return {
8484
accessKeyId: "REMOTE_ACCESS_KEY",
8585
secretAccessKey: "REMOTE_SECRET_KEY",
8686
};
8787
});
88-
vi.doMock("@aws-sdk/credential-provider-node/src/remoteProvider", () => ({
89-
remoteProvider: () => mockRemoteProvider,
88+
vi.doMock("@smithy/credential-provider-imds", () => ({
89+
fromInstanceMetadata: () => mockFromInstanceMetadata,
9090
}));
9191
});
9292

@@ -190,8 +190,8 @@ describe("fromAwsCliV2CompatibleProviderChain", () => {
190190
fromProcess: () => mockFromProcess,
191191
}));
192192

193-
vi.doMock("@aws-sdk/credential-provider-node/src/remoteProvider", () => ({
194-
remoteProvider: () => () => Promise.reject(new CredentialsProviderError("No remote credentials")),
193+
vi.doMock("@smithy/credential-provider-imds", () => ({
194+
fromInstanceMetadata: () => mockFromInstanceMetadata,
195195
}));
196196

197197
const { fromAwsCliV2CompatibleProviderChain } = await import("./fromAwsCliV2CompatibleProviderChain");
@@ -229,13 +229,13 @@ describe("fromAwsCliV2CompatibleProviderChain", () => {
229229
fromProcess: () => () => Promise.reject(new CredentialsProviderError("No process credentials")),
230230
}));
231231

232-
mockRemoteProvider = vi.fn().mockResolvedValue({
232+
mockFromInstanceMetadata = vi.fn().mockResolvedValue({
233233
accessKeyId: "REMOTE_ACCESS_KEY",
234234
secretAccessKey: "REMOTE_SECRET_KEY",
235235
});
236236

237-
vi.doMock("@aws-sdk/credential-provider-node/src/remoteProvider", () => ({
238-
remoteProvider: () => mockRemoteProvider,
237+
vi.doMock("@smithy/credential-provider-imds", () => ({
238+
fromInstanceMetadata: () => mockFromInstanceMetadata,
239239
}));
240240

241241
const { fromAwsCliV2CompatibleProviderChain } = await import("./fromAwsCliV2CompatibleProviderChain");
@@ -249,7 +249,7 @@ describe("fromAwsCliV2CompatibleProviderChain", () => {
249249
accessKeyId: "REMOTE_ACCESS_KEY",
250250
secretAccessKey: "REMOTE_SECRET_KEY",
251251
});
252-
expect(mockRemoteProvider).toHaveBeenCalled();
252+
expect(mockFromInstanceMetadata).toHaveBeenCalled();
253253
});
254254

255255
it("should throw error when no credentials are found", async () => {

packages/credential-providers/src/fromAwsCliV2CompatibleProviderChain.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import type { FromEnvInit } from "@aws-sdk/credential-provider-env";
22
import type { FromIniInit } from "@aws-sdk/credential-provider-ini";
3-
import { remoteProvider } from "@aws-sdk/credential-provider-node/src/remoteProvider";
43
import type { FromProcessInit } from "@aws-sdk/credential-provider-process";
54
import type { FromSSOInit } from "@aws-sdk/credential-provider-sso";
65
import type { FromTokenFileInit } from "@aws-sdk/credential-provider-web-identity";
76
import type { RuntimeConfigAwsCredentialIdentityProvider } from "@aws-sdk/types";
8-
import type { RemoteProviderInit } from "@smithy/credential-provider-imds";
7+
import { type RemoteProviderInit, fromInstanceMetadata } from "@smithy/credential-provider-imds";
98
import { CredentialsProviderError } from "@smithy/property-provider";
109
import type { AwsCredentialIdentity, Logger } from "@smithy/types";
1110

@@ -119,7 +118,7 @@ export const fromAwsCliV2CompatibleProviderChain =
119118
},
120119
async () => {
121120
logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::remoteProvider");
122-
return (await remoteProvider(init))();
121+
return fromInstanceMetadata(init)();
123122
},
124123
async () => {
125124
throw new CredentialsProviderError("Could not load credentials from any providers", {

packages/ec2-metadata-service/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"tslib": "^2.6.2"
3333
},
3434
"devDependencies": {
35-
"@aws-sdk/credential-providers": "*",
3635
"@tsconfig/recommended": "1.0.1",
3736
"@types/node": "^18.19.69",
3837
"concurrently": "7.0.0",

yarn.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22695,7 +22695,6 @@ __metadata:
2269522695
version: 0.0.0-use.local
2269622696
resolution: "@aws-sdk/ec2-metadata-service@workspace:packages/ec2-metadata-service"
2269722697
dependencies:
22698-
"@aws-sdk/credential-providers": "npm:*"
2269922698
"@aws-sdk/types": "npm:*"
2270022699
"@smithy/node-config-provider": "npm:^4.0.1"
2270122700
"@smithy/node-http-handler": "npm:^4.0.3"

0 commit comments

Comments
 (0)