From d6c4423dc93571ae7643f3559a6e76722ec499e9 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 11 Mar 2022 21:53:03 +0000 Subject: [PATCH 01/10] chore(types): move profile type to types --- packages/shared-ini-file-loader/src/index.ts | 1 - packages/types/src/index.ts | 1 + .../src/types.ts => types/src/profile.ts} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/{shared-ini-file-loader/src/types.ts => types/src/profile.ts} (100%) diff --git a/packages/shared-ini-file-loader/src/index.ts b/packages/shared-ini-file-loader/src/index.ts index a84df6c822c7..112f36a49e10 100644 --- a/packages/shared-ini-file-loader/src/index.ts +++ b/packages/shared-ini-file-loader/src/index.ts @@ -1,3 +1,2 @@ export * from "./getHomeDir"; export * from "./loadSharedConfigFiles"; -export * from "./types"; diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 4b5a64cab49e..e45df6a3372f 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -8,6 +8,7 @@ export * from "./http"; export * from "./logger"; export * from "./middleware"; export * from "./pagination"; +export * from "./profile"; export * from "./response"; export * from "./serde"; export * from "./shapes"; diff --git a/packages/shared-ini-file-loader/src/types.ts b/packages/types/src/profile.ts similarity index 100% rename from packages/shared-ini-file-loader/src/types.ts rename to packages/types/src/profile.ts From 1dfb02b28918b903bd423770f0117143ff466bc5 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 11 Mar 2022 21:57:06 +0000 Subject: [PATCH 02/10] chore(shared-ini-file-loader): load SharedConfigFiles from types --- packages/shared-ini-file-loader/package.json | 1 + packages/shared-ini-file-loader/src/loadSharedConfigFiles.ts | 2 +- packages/shared-ini-file-loader/src/normalizeConfigFile.ts | 2 +- packages/shared-ini-file-loader/src/parseIni.ts | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/shared-ini-file-loader/package.json b/packages/shared-ini-file-loader/package.json index b51e3147876e..0e64a5fa46bf 100644 --- a/packages/shared-ini-file-loader/package.json +++ b/packages/shared-ini-file-loader/package.json @@ -5,6 +5,7 @@ "tslib": "^2.3.0" }, "devDependencies": { + "@aws-sdk/types": "*", "@tsconfig/recommended": "1.0.1", "@types/node": "^10.0.0", "concurrently": "7.0.0", diff --git a/packages/shared-ini-file-loader/src/loadSharedConfigFiles.ts b/packages/shared-ini-file-loader/src/loadSharedConfigFiles.ts index 6b9fd9c9c028..895a73a5046c 100644 --- a/packages/shared-ini-file-loader/src/loadSharedConfigFiles.ts +++ b/packages/shared-ini-file-loader/src/loadSharedConfigFiles.ts @@ -1,10 +1,10 @@ +import { SharedConfigFiles } from "@aws-sdk/types"; import { join } from "path"; import { getHomeDir } from "./getHomeDir"; import { normalizeConfigFile } from "./normalizeConfigFile"; import { parseIni } from "./parseIni"; import { slurpFile } from "./slurpFile"; -import { SharedConfigFiles } from "./types"; export const ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE"; export const ENV_CONFIG_PATH = "AWS_CONFIG_FILE"; diff --git a/packages/shared-ini-file-loader/src/normalizeConfigFile.ts b/packages/shared-ini-file-loader/src/normalizeConfigFile.ts index 4eea040848ff..dc37d6531cd7 100644 --- a/packages/shared-ini-file-loader/src/normalizeConfigFile.ts +++ b/packages/shared-ini-file-loader/src/normalizeConfigFile.ts @@ -1,4 +1,4 @@ -import { ParsedIniData } from "./types"; +import { ParsedIniData } from "@aws-sdk/types"; const profileKeyRegex = /^profile\s(["'])?([^\1]+)\1$/; diff --git a/packages/shared-ini-file-loader/src/parseIni.ts b/packages/shared-ini-file-loader/src/parseIni.ts index e46b6dd06351..108c507e6392 100644 --- a/packages/shared-ini-file-loader/src/parseIni.ts +++ b/packages/shared-ini-file-loader/src/parseIni.ts @@ -1,4 +1,4 @@ -import { ParsedIniData } from "./types"; +import { ParsedIniData } from "@aws-sdk/types"; const profileNameBlockList = ["__proto__", "profile __proto__"]; From 037bf07bc4359db0f7a682e0a140550eeb4171f2 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 11 Mar 2022 22:00:32 +0000 Subject: [PATCH 03/10] chore(node-config-provider): load profile types from types package --- .../src/fromSharedConfigFiles.spec.ts | 3 ++- .../node-config-provider/src/fromSharedConfigFiles.ts | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/node-config-provider/src/fromSharedConfigFiles.spec.ts b/packages/node-config-provider/src/fromSharedConfigFiles.spec.ts index 810552247712..ed6680abada6 100644 --- a/packages/node-config-provider/src/fromSharedConfigFiles.spec.ts +++ b/packages/node-config-provider/src/fromSharedConfigFiles.spec.ts @@ -1,5 +1,6 @@ import { CredentialsProviderError } from "@aws-sdk/property-provider"; -import { loadSharedConfigFiles, ParsedIniData, Profile } from "@aws-sdk/shared-ini-file-loader"; +import { loadSharedConfigFiles } from "@aws-sdk/shared-ini-file-loader"; +import { ParsedIniData, Profile } from "@aws-sdk/types"; import { ENV_PROFILE, fromSharedConfigFiles, GetterFromConfig, SharedConfigInit } from "./fromSharedConfigFiles"; diff --git a/packages/node-config-provider/src/fromSharedConfigFiles.ts b/packages/node-config-provider/src/fromSharedConfigFiles.ts index f75199392565..5094f16b0058 100644 --- a/packages/node-config-provider/src/fromSharedConfigFiles.ts +++ b/packages/node-config-provider/src/fromSharedConfigFiles.ts @@ -1,11 +1,6 @@ import { CredentialsProviderError } from "@aws-sdk/property-provider"; -import { - loadSharedConfigFiles, - Profile, - SharedConfigFiles, - SharedConfigInit as BaseSharedConfigInit, -} from "@aws-sdk/shared-ini-file-loader"; -import { Provider } from "@aws-sdk/types"; +import { loadSharedConfigFiles, SharedConfigInit as BaseSharedConfigInit } from "@aws-sdk/shared-ini-file-loader"; +import { Profile, Provider, SharedConfigFiles } from "@aws-sdk/types"; const DEFAULT_PROFILE = "default"; export const ENV_PROFILE = "AWS_PROFILE"; From 920c6b7d41894dcf5e310e5a3e3fcb03551e8ce3 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 11 Mar 2022 22:02:42 +0000 Subject: [PATCH 04/10] chore(util-credentials): load profile types from types package --- packages/util-credentials/package.json | 1 + packages/util-credentials/src/parse-known-profiles.ts | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/util-credentials/package.json b/packages/util-credentials/package.json index ef16dbe069eb..32746a07dcf8 100644 --- a/packages/util-credentials/package.json +++ b/packages/util-credentials/package.json @@ -27,6 +27,7 @@ "tslib": "^2.3.0" }, "devDependencies": { + "@aws-sdk/types": "*", "@tsconfig/recommended": "1.0.1", "@types/node": "^10.0.0", "concurrently": "7.0.0", diff --git a/packages/util-credentials/src/parse-known-profiles.ts b/packages/util-credentials/src/parse-known-profiles.ts index b3d9280c5e58..982d8f86424d 100644 --- a/packages/util-credentials/src/parse-known-profiles.ts +++ b/packages/util-credentials/src/parse-known-profiles.ts @@ -1,9 +1,5 @@ -import { - loadSharedConfigFiles, - ParsedIniData, - SharedConfigFiles, - SharedConfigInit, -} from "@aws-sdk/shared-ini-file-loader"; +import { loadSharedConfigFiles, SharedConfigInit } from "@aws-sdk/shared-ini-file-loader"; +import { ParsedIniData, SharedConfigFiles } from "@aws-sdk/types"; export interface SourceProfileInit extends SharedConfigInit { /** From 8f94b601c640e2aec7a82972db40cbf6f868d592 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 11 Mar 2022 22:04:13 +0000 Subject: [PATCH 05/10] chore(credential-provider-process): load profile types from types package --- .../src/resolveProcessCredentials.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/credential-provider-process/src/resolveProcessCredentials.ts b/packages/credential-provider-process/src/resolveProcessCredentials.ts index 97c3ce6de411..8c7d7fb15d3b 100644 --- a/packages/credential-provider-process/src/resolveProcessCredentials.ts +++ b/packages/credential-provider-process/src/resolveProcessCredentials.ts @@ -1,6 +1,5 @@ import { CredentialsProviderError } from "@aws-sdk/property-provider"; -import { ParsedIniData } from "@aws-sdk/shared-ini-file-loader"; -import { Credentials } from "@aws-sdk/types"; +import { Credentials, ParsedIniData } from "@aws-sdk/types"; import { exec } from "child_process"; import { promisify } from "util"; From 150329221f35937fc0f25b9804f86ace7d548d55 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 11 Mar 2022 22:06:58 +0000 Subject: [PATCH 06/10] chore(credential-provider-sso): load profile types from types package --- packages/credential-provider-sso/src/isSsoProfile.ts | 2 +- packages/credential-provider-sso/src/types.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/credential-provider-sso/src/isSsoProfile.ts b/packages/credential-provider-sso/src/isSsoProfile.ts index 8d5233e7ee73..aa3cd27541d4 100644 --- a/packages/credential-provider-sso/src/isSsoProfile.ts +++ b/packages/credential-provider-sso/src/isSsoProfile.ts @@ -1,4 +1,4 @@ -import { Profile } from "@aws-sdk/shared-ini-file-loader"; +import { Profile } from "@aws-sdk/types"; import { SsoProfile } from "./types"; diff --git a/packages/credential-provider-sso/src/types.ts b/packages/credential-provider-sso/src/types.ts index d2880e037fe9..68d86d268942 100644 --- a/packages/credential-provider-sso/src/types.ts +++ b/packages/credential-provider-sso/src/types.ts @@ -1,4 +1,4 @@ -import { Profile } from "@aws-sdk/shared-ini-file-loader"; +import { Profile } from "@aws-sdk/types"; /** * Cached SSO token retrieved from SSO login flow. From 12272b57ffb2f8de6be13e3577594cdf067b592c Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 11 Mar 2022 22:11:17 +0000 Subject: [PATCH 07/10] chore(credential-provider-ini): load profile types from types package --- .../src/resolveAssumeRoleCredentials.ts | 2 +- packages/credential-provider-ini/src/resolveProfileData.ts | 3 +-- .../credential-provider-ini/src/resolveStaticCredentials.ts | 3 +-- .../src/resolveWebIdentityCredentials.ts | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/credential-provider-ini/src/resolveAssumeRoleCredentials.ts b/packages/credential-provider-ini/src/resolveAssumeRoleCredentials.ts index 1ca1d22e4b94..a48a039db833 100644 --- a/packages/credential-provider-ini/src/resolveAssumeRoleCredentials.ts +++ b/packages/credential-provider-ini/src/resolveAssumeRoleCredentials.ts @@ -1,5 +1,5 @@ import { CredentialsProviderError } from "@aws-sdk/property-provider"; -import { ParsedIniData, Profile } from "@aws-sdk/shared-ini-file-loader"; +import { ParsedIniData, Profile } from "@aws-sdk/types"; import { getMasterProfileName } from "@aws-sdk/util-credentials"; import { FromIniInit } from "./fromIni"; diff --git a/packages/credential-provider-ini/src/resolveProfileData.ts b/packages/credential-provider-ini/src/resolveProfileData.ts index 1590bd95381d..6078f936b2f8 100644 --- a/packages/credential-provider-ini/src/resolveProfileData.ts +++ b/packages/credential-provider-ini/src/resolveProfileData.ts @@ -1,6 +1,5 @@ import { CredentialsProviderError } from "@aws-sdk/property-provider"; -import { ParsedIniData } from "@aws-sdk/shared-ini-file-loader"; -import { Credentials } from "@aws-sdk/types"; +import { Credentials, ParsedIniData } from "@aws-sdk/types"; import { FromIniInit } from "./fromIni"; import { isAssumeRoleProfile, resolveAssumeRoleCredentials } from "./resolveAssumeRoleCredentials"; diff --git a/packages/credential-provider-ini/src/resolveStaticCredentials.ts b/packages/credential-provider-ini/src/resolveStaticCredentials.ts index 264456c1baf2..1a0ec1888555 100644 --- a/packages/credential-provider-ini/src/resolveStaticCredentials.ts +++ b/packages/credential-provider-ini/src/resolveStaticCredentials.ts @@ -1,5 +1,4 @@ -import { Profile } from "@aws-sdk/shared-ini-file-loader"; -import { Credentials } from "@aws-sdk/types"; +import { Credentials, Profile } from "@aws-sdk/types"; export interface StaticCredsProfile extends Profile { aws_access_key_id: string; diff --git a/packages/credential-provider-ini/src/resolveWebIdentityCredentials.ts b/packages/credential-provider-ini/src/resolveWebIdentityCredentials.ts index d0fc548de6f7..f437570b342d 100644 --- a/packages/credential-provider-ini/src/resolveWebIdentityCredentials.ts +++ b/packages/credential-provider-ini/src/resolveWebIdentityCredentials.ts @@ -1,6 +1,5 @@ import { fromTokenFile } from "@aws-sdk/credential-provider-web-identity"; -import { Profile } from "@aws-sdk/shared-ini-file-loader"; -import { Credentials } from "@aws-sdk/types"; +import { Credentials, Profile } from "@aws-sdk/types"; import { FromIniInit } from "./fromIni"; From b062dab645be36b64aa0c4d891d21cd60559fb63 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 11 Mar 2022 22:24:11 +0000 Subject: [PATCH 08/10] test(node-config-provider): import Profile from types package --- packages/node-config-provider/src/configLoader.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node-config-provider/src/configLoader.spec.ts b/packages/node-config-provider/src/configLoader.spec.ts index 81f617762684..7efe47135086 100644 --- a/packages/node-config-provider/src/configLoader.spec.ts +++ b/packages/node-config-provider/src/configLoader.spec.ts @@ -1,5 +1,5 @@ import { chain, fromStatic, memoize } from "@aws-sdk/property-provider"; -import { Profile } from "@aws-sdk/shared-ini-file-loader/src"; +import { Profile } from "@aws-sdk/types"; import { loadConfig } from "./configLoader"; import { fromEnv } from "./fromEnv"; From 914009c5472ac184aa3567a7a1d758ba5cf7dda5 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 11 Mar 2022 22:40:35 +0000 Subject: [PATCH 09/10] chore(shared-ini-file-loader): re-export profile types from types --- packages/shared-ini-file-loader/src/index.ts | 1 + packages/shared-ini-file-loader/src/types.ts | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 packages/shared-ini-file-loader/src/types.ts diff --git a/packages/shared-ini-file-loader/src/index.ts b/packages/shared-ini-file-loader/src/index.ts index 112f36a49e10..a84df6c822c7 100644 --- a/packages/shared-ini-file-loader/src/index.ts +++ b/packages/shared-ini-file-loader/src/index.ts @@ -1,2 +1,3 @@ export * from "./getHomeDir"; export * from "./loadSharedConfigFiles"; +export * from "./types"; diff --git a/packages/shared-ini-file-loader/src/types.ts b/packages/shared-ini-file-loader/src/types.ts new file mode 100644 index 000000000000..096b3877cc9f --- /dev/null +++ b/packages/shared-ini-file-loader/src/types.ts @@ -0,0 +1,20 @@ +import { + ParsedIniData as __ParsedIniData, + Profile as __Profile, + SharedConfigFiles as __SharedConfigFiles, +} from "@aws-sdk/types"; + +/** + * @deprecated Use Profile from "@aws-sdk/types" instead + */ +export type Profile = __Profile; + +/** + * @deprecated Use ParsedIniData from "@aws-sdk/types" instead + */ +export type ParsedIniData = __ParsedIniData; + +/** + * @deprecated Use SharedConfigFiles from "@aws-sdk/types" instead + */ +export type SharedConfigFiles = __SharedConfigFiles; From 9415d69f1ffc0a8d558d12fbb64846b5cdcea748 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:00:54 +0000 Subject: [PATCH 10/10] chore(types): mark profile types as internal --- packages/types/src/profile.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/types/src/profile.ts b/packages/types/src/profile.ts index aaa2513cefb7..cb9505d18154 100644 --- a/packages/types/src/profile.ts +++ b/packages/types/src/profile.ts @@ -1,11 +1,20 @@ +/** + * @internal + */ export interface Profile { [key: string]: string | undefined; } +/** + * @internal + */ export interface ParsedIniData { [key: string]: Profile; } +/** + * @internal + */ export interface SharedConfigFiles { credentialsFile: ParsedIniData; configFile: ParsedIniData;