Skip to content

Commit 32fac22

Browse files
committed
chore: remove SharedConfigInit from loadSharedConfigFiles
1 parent 99c9ee0 commit 32fac22

File tree

3 files changed

+7
-25
lines changed

3 files changed

+7
-25
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export const defaultProvider = (
5050
const options = {
5151
profile: process.env[ENV_PROFILE],
5252
...init,
53-
...(!init.loadedConfig && { loadedConfig: loadSharedConfigFiles(init) }),
53+
...(!init.loadedConfig && { loadedConfig: loadSharedConfigFiles() }),
5454
};
5555

5656
const providerChain = chain(

packages/shared-ini-file-loader/src/loadSharedConfigFiles.ts

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,11 @@ import { slurpFile } from "./slurpFile";
99
export const ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
1010
export const ENV_CONFIG_PATH = "AWS_CONFIG_FILE";
1111

12-
export interface SharedConfigInit {
13-
/**
14-
* The path at which to locate the ini credentials file. Defaults to the
15-
* value of the `AWS_SHARED_CREDENTIALS_FILE` environment variable (if
16-
* defined) or `~/.aws/credentials` otherwise.
17-
*/
18-
filepath?: string;
19-
20-
/**
21-
* The path at which to locate the ini config file. Defaults to the value of
22-
* the `AWS_CONFIG_FILE` environment variable (if defined) or
23-
* `~/.aws/config` otherwise.
24-
*/
25-
configFilepath?: string;
26-
}
27-
2812
const swallowError = () => ({});
2913

30-
export const loadSharedConfigFiles = async (init: SharedConfigInit = {}): Promise<SharedConfigFiles> => {
31-
const {
32-
filepath = process.env[ENV_CREDENTIALS_PATH] || join(getHomeDir(), ".aws", "credentials"),
33-
configFilepath = process.env[ENV_CONFIG_PATH] || join(getHomeDir(), ".aws", "config"),
34-
} = init;
14+
export const loadSharedConfigFiles = async (): Promise<SharedConfigFiles> => {
15+
const filepath = process.env[ENV_CREDENTIALS_PATH] || join(getHomeDir(), ".aws", "credentials");
16+
const configFilepath = process.env[ENV_CONFIG_PATH] || join(getHomeDir(), ".aws", "config");
3517

3618
const parsedFiles = await Promise.all([
3719
slurpFile(configFilepath).then(parseIni).then(normalizeConfigFile).catch(swallowError),

packages/shared-ini-file-loader/src/parseKnownFiles.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { ParsedIniData, SharedConfigFiles } from "@aws-sdk/types";
22

3-
import { loadSharedConfigFiles, SharedConfigInit } from "./loadSharedConfigFiles";
3+
import { loadSharedConfigFiles } from "./loadSharedConfigFiles";
44

5-
export interface SourceProfileInit extends SharedConfigInit {
5+
export interface SourceProfileInit {
66
/**
77
* The configuration profile to use.
88
*/
@@ -24,7 +24,7 @@ export interface SourceProfileInit extends SharedConfigInit {
2424
* @internal
2525
*/
2626
export const parseKnownFiles = async (init: SourceProfileInit): Promise<ParsedIniData> => {
27-
const { loadedConfig = loadSharedConfigFiles(init) } = init;
27+
const { loadedConfig = loadSharedConfigFiles() } = init;
2828

2929
const parsedFiles = await loadedConfig;
3030
return {

0 commit comments

Comments
 (0)