chore(types): move profile types from other packages (#3414)

trivikr · web-flow · commit ad6890d9eb58 · 2022-03-14T09:08:28.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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";
 
diff --git 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";
 
diff --git 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
@@ -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.
diff --git 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";
diff --git 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
@@ -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";
diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-import { ParsedIniData } from "./types";
+import { ParsedIniData } from "@aws-sdk/types";
 
 const profileNameBlockList = ["__proto__", "profile __proto__"];
 
diff --git a/packages/shared-ini-file-loader/src/types.ts b/packages/shared-ini-file-loader/src/types.ts
@@ -1,12 +1,20 @@
-export interface Profile {
-  [key: string]: string | undefined;
-}
+import {
+  ParsedIniData as __ParsedIniData,
+  Profile as __Profile,
+  SharedConfigFiles as __SharedConfigFiles,
+} from "@aws-sdk/types";
 
-export interface ParsedIniData {
-  [key: string]: Profile;
-}
+/**
+ * @deprecated Use Profile from "@aws-sdk/types" instead
+ */
+export type Profile = __Profile;
 
-export interface SharedConfigFiles {
-  credentialsFile: ParsedIniData;
-  configFile: ParsedIniData;
-}
+/**
+ * @deprecated Use ParsedIniData from "@aws-sdk/types" instead
+ */
+export type ParsedIniData = __ParsedIniData;
+
+/**
+ * @deprecated Use SharedConfigFiles from "@aws-sdk/types" instead
+ */
+export type SharedConfigFiles = __SharedConfigFiles;
diff --git 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/types/src/profile.ts b/packages/types/src/profile.ts
@@ -0,0 +1,21 @@
+/**
+ * @internal
+ */
+export interface Profile {
+  [key: string]: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export interface ParsedIniData {
+  [key: string]: Profile;
+}
+
+/**
+ * @internal
+ */
+export interface SharedConfigFiles {
+  credentialsFile: ParsedIniData;
+  configFile: ParsedIniData;
+}
diff --git 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
@@ -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 {
   /**

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Profile } from "@aws-sdk/shared-ini-file-loader";`
	`1`	`+import { Profile } from "@aws-sdk/types";`
`2`	`2`
`3`	`3`	`import { SsoProfile } from "./types";`
`4`	`4`