Skip to content

Commit ad6890d

Browse files
authored
chore(types): move profile types from other packages (#3414)
1 parent cd7d6ab commit ad6890d

19 files changed

+59
-39
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { CredentialsProviderError } from "@aws-sdk/property-provider";
2-
import { ParsedIniData, Profile } from "@aws-sdk/shared-ini-file-loader";
2+
import { ParsedIniData, Profile } from "@aws-sdk/types";
33
import { getMasterProfileName } from "@aws-sdk/util-credentials";
44

55
import { FromIniInit } from "./fromIni";

packages/credential-provider-ini/src/resolveProfileData.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { CredentialsProviderError } from "@aws-sdk/property-provider";
2-
import { ParsedIniData } from "@aws-sdk/shared-ini-file-loader";
3-
import { Credentials } from "@aws-sdk/types";
2+
import { Credentials, ParsedIniData } from "@aws-sdk/types";
43

54
import { FromIniInit } from "./fromIni";
65
import { isAssumeRoleProfile, resolveAssumeRoleCredentials } from "./resolveAssumeRoleCredentials";

packages/credential-provider-ini/src/resolveStaticCredentials.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Profile } from "@aws-sdk/shared-ini-file-loader";
2-
import { Credentials } from "@aws-sdk/types";
1+
import { Credentials, Profile } from "@aws-sdk/types";
32

43
export interface StaticCredsProfile extends Profile {
54
aws_access_key_id: string;

packages/credential-provider-ini/src/resolveWebIdentityCredentials.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { fromTokenFile } from "@aws-sdk/credential-provider-web-identity";
2-
import { Profile } from "@aws-sdk/shared-ini-file-loader";
3-
import { Credentials } from "@aws-sdk/types";
2+
import { Credentials, Profile } from "@aws-sdk/types";
43

54
import { FromIniInit } from "./fromIni";
65

packages/credential-provider-process/src/resolveProcessCredentials.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { CredentialsProviderError } from "@aws-sdk/property-provider";
2-
import { ParsedIniData } from "@aws-sdk/shared-ini-file-loader";
3-
import { Credentials } from "@aws-sdk/types";
2+
import { Credentials, ParsedIniData } from "@aws-sdk/types";
43
import { exec } from "child_process";
54
import { promisify } from "util";
65

packages/credential-provider-sso/src/isSsoProfile.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Profile } from "@aws-sdk/shared-ini-file-loader";
1+
import { Profile } from "@aws-sdk/types";
22

33
import { SsoProfile } from "./types";
44

packages/credential-provider-sso/src/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Profile } from "@aws-sdk/shared-ini-file-loader";
1+
import { Profile } from "@aws-sdk/types";
22

33
/**
44
* Cached SSO token retrieved from SSO login flow.

packages/node-config-provider/src/configLoader.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { chain, fromStatic, memoize } from "@aws-sdk/property-provider";
2-
import { Profile } from "@aws-sdk/shared-ini-file-loader/src";
2+
import { Profile } from "@aws-sdk/types";
33

44
import { loadConfig } from "./configLoader";
55
import { fromEnv } from "./fromEnv";

packages/node-config-provider/src/fromSharedConfigFiles.spec.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { CredentialsProviderError } from "@aws-sdk/property-provider";
2-
import { loadSharedConfigFiles, ParsedIniData, Profile } from "@aws-sdk/shared-ini-file-loader";
2+
import { loadSharedConfigFiles } from "@aws-sdk/shared-ini-file-loader";
3+
import { ParsedIniData, Profile } from "@aws-sdk/types";
34

45
import { ENV_PROFILE, fromSharedConfigFiles, GetterFromConfig, SharedConfigInit } from "./fromSharedConfigFiles";
56

packages/node-config-provider/src/fromSharedConfigFiles.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
import { CredentialsProviderError } from "@aws-sdk/property-provider";
2-
import {
3-
loadSharedConfigFiles,
4-
Profile,
5-
SharedConfigFiles,
6-
SharedConfigInit as BaseSharedConfigInit,
7-
} from "@aws-sdk/shared-ini-file-loader";
8-
import { Provider } from "@aws-sdk/types";
2+
import { loadSharedConfigFiles, SharedConfigInit as BaseSharedConfigInit } from "@aws-sdk/shared-ini-file-loader";
3+
import { Profile, Provider, SharedConfigFiles } from "@aws-sdk/types";
94

105
const DEFAULT_PROFILE = "default";
116
export const ENV_PROFILE = "AWS_PROFILE";

packages/shared-ini-file-loader/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"tslib": "^2.3.0"
66
},
77
"devDependencies": {
8+
"@aws-sdk/types": "*",
89
"@tsconfig/recommended": "1.0.1",
910
"@types/node": "^10.0.0",
1011
"concurrently": "7.0.0",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { SharedConfigFiles } from "@aws-sdk/types";
12
import { join } from "path";
23

34
import { getHomeDir } from "./getHomeDir";
45
import { normalizeConfigFile } from "./normalizeConfigFile";
56
import { parseIni } from "./parseIni";
67
import { slurpFile } from "./slurpFile";
7-
import { SharedConfigFiles } from "./types";
88

99
export const ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
1010
export const ENV_CONFIG_PATH = "AWS_CONFIG_FILE";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ParsedIniData } from "./types";
1+
import { ParsedIniData } from "@aws-sdk/types";
22

33
const profileKeyRegex = /^profile\s(["'])?([^\1]+)\1$/;
44

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ParsedIniData } from "./types";
1+
import { ParsedIniData } from "@aws-sdk/types";
22

33
const profileNameBlockList = ["__proto__", "profile __proto__"];
44

+18-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
export interface Profile {
2-
[key: string]: string | undefined;
3-
}
1+
import {
2+
ParsedIniData as __ParsedIniData,
3+
Profile as __Profile,
4+
SharedConfigFiles as __SharedConfigFiles,
5+
} from "@aws-sdk/types";
46

5-
export interface ParsedIniData {
6-
[key: string]: Profile;
7-
}
7+
/**
8+
* @deprecated Use Profile from "@aws-sdk/types" instead
9+
*/
10+
export type Profile = __Profile;
811

9-
export interface SharedConfigFiles {
10-
credentialsFile: ParsedIniData;
11-
configFile: ParsedIniData;
12-
}
12+
/**
13+
* @deprecated Use ParsedIniData from "@aws-sdk/types" instead
14+
*/
15+
export type ParsedIniData = __ParsedIniData;
16+
17+
/**
18+
* @deprecated Use SharedConfigFiles from "@aws-sdk/types" instead
19+
*/
20+
export type SharedConfigFiles = __SharedConfigFiles;

packages/types/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export * from "./http";
88
export * from "./logger";
99
export * from "./middleware";
1010
export * from "./pagination";
11+
export * from "./profile";
1112
export * from "./response";
1213
export * from "./serde";
1314
export * from "./shapes";

packages/types/src/profile.ts

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/**
2+
* @internal
3+
*/
4+
export interface Profile {
5+
[key: string]: string | undefined;
6+
}
7+
8+
/**
9+
* @internal
10+
*/
11+
export interface ParsedIniData {
12+
[key: string]: Profile;
13+
}
14+
15+
/**
16+
* @internal
17+
*/
18+
export interface SharedConfigFiles {
19+
credentialsFile: ParsedIniData;
20+
configFile: ParsedIniData;
21+
}

packages/util-credentials/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"tslib": "^2.3.0"
2828
},
2929
"devDependencies": {
30+
"@aws-sdk/types": "*",
3031
"@tsconfig/recommended": "1.0.1",
3132
"@types/node": "^10.0.0",
3233
"concurrently": "7.0.0",

packages/util-credentials/src/parse-known-profiles.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
import {
2-
loadSharedConfigFiles,
3-
ParsedIniData,
4-
SharedConfigFiles,
5-
SharedConfigInit,
6-
} from "@aws-sdk/shared-ini-file-loader";
1+
import { loadSharedConfigFiles, SharedConfigInit } from "@aws-sdk/shared-ini-file-loader";
2+
import { ParsedIniData, SharedConfigFiles } from "@aws-sdk/types";
73

84
export interface SourceProfileInit extends SharedConfigInit {
95
/**

0 commit comments

Comments
 (0)