@cdk8s/awscdk-resolver 0.0.57 → 0.0.59

package/node_modules/@aws-sdk/client-sts/dist-cjs/index.js

@@ -340,7 +340,7 @@ var se_GetSessionTokenCommand = /* @__PURE__ */ __name(async (input, context) =>
 }, "se_GetSessionTokenCommand");
 var de_AssumeRoleCommand = /* @__PURE__ */ __name(async (output, context) => {
   if (output.statusCode >= 300) {
-    return de_AssumeRoleCommandError(output, context);
+    return de_CommandError(output, context);
   }
   const data = await parseBody(output.body, context);
   let contents = {};
@@ -351,37 +351,9 @@ var de_AssumeRoleCommand = /* @__PURE__ */ __name(async (output, context) => {
   };
   return response;
 }, "de_AssumeRoleCommand");
-var de_AssumeRoleCommandError = /* @__PURE__ */ __name(async (output, context) => {
-  const parsedOutput = {
-    ...output,
-    body: await parseErrorBody(output.body, context)
-  };
-  const errorCode = loadQueryErrorCode(output, parsedOutput.body);
-  switch (errorCode) {
-    case "ExpiredTokenException":
-    case "com.amazonaws.sts#ExpiredTokenException":
-      throw await de_ExpiredTokenExceptionRes(parsedOutput, context);
-    case "MalformedPolicyDocument":
-    case "com.amazonaws.sts#MalformedPolicyDocumentException":
-      throw await de_MalformedPolicyDocumentExceptionRes(parsedOutput, context);
-    case "PackedPolicyTooLarge":
-    case "com.amazonaws.sts#PackedPolicyTooLargeException":
-      throw await de_PackedPolicyTooLargeExceptionRes(parsedOutput, context);
-    case "RegionDisabledException":
-    case "com.amazonaws.sts#RegionDisabledException":
-      throw await de_RegionDisabledExceptionRes(parsedOutput, context);
-    default:
-      const parsedBody = parsedOutput.body;
-      return throwDefaultError({
-        output,
-        parsedBody: parsedBody.Error,
-        errorCode
-      });
-  }
-}, "de_AssumeRoleCommandError");
 var de_AssumeRoleWithSAMLCommand = /* @__PURE__ */ __name(async (output, context) => {
   if (output.statusCode >= 300) {
-    return de_AssumeRoleWithSAMLCommandError(output, context);
+    return de_CommandError(output, context);
   }
   const data = await parseBody(output.body, context);
   let contents = {};
@@ -392,43 +364,9 @@ var de_AssumeRoleWithSAMLCommand = /* @__PURE__ */ __name(async (output, context
   };
   return response;
 }, "de_AssumeRoleWithSAMLCommand");
-var de_AssumeRoleWithSAMLCommandError = /* @__PURE__ */ __name(async (output, context) => {
-  const parsedOutput = {
-    ...output,
-    body: await parseErrorBody(output.body, context)
-  };
-  const errorCode = loadQueryErrorCode(output, parsedOutput.body);
-  switch (errorCode) {
-    case "ExpiredTokenException":
-    case "com.amazonaws.sts#ExpiredTokenException":
-      throw await de_ExpiredTokenExceptionRes(parsedOutput, context);
-    case "IDPRejectedClaim":
-    case "com.amazonaws.sts#IDPRejectedClaimException":
-      throw await de_IDPRejectedClaimExceptionRes(parsedOutput, context);
-    case "InvalidIdentityToken":
-    case "com.amazonaws.sts#InvalidIdentityTokenException":
-      throw await de_InvalidIdentityTokenExceptionRes(parsedOutput, context);
-    case "MalformedPolicyDocument":
-    case "com.amazonaws.sts#MalformedPolicyDocumentException":
-      throw await de_MalformedPolicyDocumentExceptionRes(parsedOutput, context);
-    case "PackedPolicyTooLarge":
-    case "com.amazonaws.sts#PackedPolicyTooLargeException":
-      throw await de_PackedPolicyTooLargeExceptionRes(parsedOutput, context);
-    case "RegionDisabledException":
-    case "com.amazonaws.sts#RegionDisabledException":
-      throw await de_RegionDisabledExceptionRes(parsedOutput, context);
-    default:
-      const parsedBody = parsedOutput.body;
-      return throwDefaultError({
-        output,
-        parsedBody: parsedBody.Error,
-        errorCode
-      });
-  }
-}, "de_AssumeRoleWithSAMLCommandError");
 var de_AssumeRoleWithWebIdentityCommand = /* @__PURE__ */ __name(async (output, context) => {
   if (output.statusCode >= 300) {
-    return de_AssumeRoleWithWebIdentityCommandError(output, context);
+    return de_CommandError(output, context);
   }
   const data = await parseBody(output.body, context);
   let contents = {};
@@ -439,46 +377,9 @@ var de_AssumeRoleWithWebIdentityCommand = /* @__PURE__ */ __name(async (output,
   };
   return response;
 }, "de_AssumeRoleWithWebIdentityCommand");
-var de_AssumeRoleWithWebIdentityCommandError = /* @__PURE__ */ __name(async (output, context) => {
-  const parsedOutput = {
-    ...output,
-    body: await parseErrorBody(output.body, context)
-  };
-  const errorCode = loadQueryErrorCode(output, parsedOutput.body);
-  switch (errorCode) {
-    case "ExpiredTokenException":
-    case "com.amazonaws.sts#ExpiredTokenException":
-      throw await de_ExpiredTokenExceptionRes(parsedOutput, context);
-    case "IDPCommunicationError":
-    case "com.amazonaws.sts#IDPCommunicationErrorException":
-      throw await de_IDPCommunicationErrorExceptionRes(parsedOutput, context);
-    case "IDPRejectedClaim":
-    case "com.amazonaws.sts#IDPRejectedClaimException":
-      throw await de_IDPRejectedClaimExceptionRes(parsedOutput, context);
-    case "InvalidIdentityToken":
-    case "com.amazonaws.sts#InvalidIdentityTokenException":
-      throw await de_InvalidIdentityTokenExceptionRes(parsedOutput, context);
-    case "MalformedPolicyDocument":
-    case "com.amazonaws.sts#MalformedPolicyDocumentException":
-      throw await de_MalformedPolicyDocumentExceptionRes(parsedOutput, context);
-    case "PackedPolicyTooLarge":
-    case "com.amazonaws.sts#PackedPolicyTooLargeException":
-      throw await de_PackedPolicyTooLargeExceptionRes(parsedOutput, context);
-    case "RegionDisabledException":
-    case "com.amazonaws.sts#RegionDisabledException":
-      throw await de_RegionDisabledExceptionRes(parsedOutput, context);
-    default:
-      const parsedBody = parsedOutput.body;
-      return throwDefaultError({
-        output,
-        parsedBody: parsedBody.Error,
-        errorCode
-      });
-  }
-}, "de_AssumeRoleWithWebIdentityCommandError");
 var de_DecodeAuthorizationMessageCommand = /* @__PURE__ */ __name(async (output, context) => {
   if (output.statusCode >= 300) {
-    return de_DecodeAuthorizationMessageCommandError(output, context);
+    return de_CommandError(output, context);
   }
   const data = await parseBody(output.body, context);
   let contents = {};
@@ -489,28 +390,9 @@ var de_DecodeAuthorizationMessageCommand = /* @__PURE__ */ __name(async (output,
   };
   return response;
 }, "de_DecodeAuthorizationMessageCommand");
-var de_DecodeAuthorizationMessageCommandError = /* @__PURE__ */ __name(async (output, context) => {
-  const parsedOutput = {
-    ...output,
-    body: await parseErrorBody(output.body, context)
-  };
-  const errorCode = loadQueryErrorCode(output, parsedOutput.body);
-  switch (errorCode) {
-    case "InvalidAuthorizationMessageException":
-    case "com.amazonaws.sts#InvalidAuthorizationMessageException":
-      throw await de_InvalidAuthorizationMessageExceptionRes(parsedOutput, context);
-    default:
-      const parsedBody = parsedOutput.body;
-      return throwDefaultError({
-        output,
-        parsedBody: parsedBody.Error,
-        errorCode
-      });
-  }
-}, "de_DecodeAuthorizationMessageCommandError");
 var de_GetAccessKeyInfoCommand = /* @__PURE__ */ __name(async (output, context) => {
   if (output.statusCode >= 300) {
-    return de_GetAccessKeyInfoCommandError(output, context);
+    return de_CommandError(output, context);
   }
   const data = await parseBody(output.body, context);
   let contents = {};
@@ -521,22 +403,9 @@ var de_GetAccessKeyInfoCommand = /* @__PURE__ */ __name(async (output, context)
   };
   return response;
 }, "de_GetAccessKeyInfoCommand");
-var de_GetAccessKeyInfoCommandError = /* @__PURE__ */ __name(async (output, context) => {
-  const parsedOutput = {
-    ...output,
-    body: await parseErrorBody(output.body, context)
-  };
-  const errorCode = loadQueryErrorCode(output, parsedOutput.body);
-  const parsedBody = parsedOutput.body;
-  return throwDefaultError({
-    output,
-    parsedBody: parsedBody.Error,
-    errorCode
-  });
-}, "de_GetAccessKeyInfoCommandError");
 var de_GetCallerIdentityCommand = /* @__PURE__ */ __name(async (output, context) => {
   if (output.statusCode >= 300) {
-    return de_GetCallerIdentityCommandError(output, context);
+    return de_CommandError(output, context);
   }
   const data = await parseBody(output.body, context);
   let contents = {};
@@ -547,22 +416,9 @@ var de_GetCallerIdentityCommand = /* @__PURE__ */ __name(async (output, context)
   };
   return response;
 }, "de_GetCallerIdentityCommand");
-var de_GetCallerIdentityCommandError = /* @__PURE__ */ __name(async (output, context) => {
-  const parsedOutput = {
-    ...output,
-    body: await parseErrorBody(output.body, context)
-  };
-  const errorCode = loadQueryErrorCode(output, parsedOutput.body);
-  const parsedBody = parsedOutput.body;
-  return throwDefaultError({
-    output,
-    parsedBody: parsedBody.Error,
-    errorCode
-  });
-}, "de_GetCallerIdentityCommandError");
 var de_GetFederationTokenCommand = /* @__PURE__ */ __name(async (output, context) => {
   if (output.statusCode >= 300) {
-    return de_GetFederationTokenCommandError(output, context);
+    return de_CommandError(output, context);
   }
   const data = await parseBody(output.body, context);
   let contents = {};
@@ -573,34 +429,9 @@ var de_GetFederationTokenCommand = /* @__PURE__ */ __name(async (output, context
   };
   return response;
 }, "de_GetFederationTokenCommand");
-var de_GetFederationTokenCommandError = /* @__PURE__ */ __name(async (output, context) => {
-  const parsedOutput = {
-    ...output,
-    body: await parseErrorBody(output.body, context)
-  };
-  const errorCode = loadQueryErrorCode(output, parsedOutput.body);
-  switch (errorCode) {
-    case "MalformedPolicyDocument":
-    case "com.amazonaws.sts#MalformedPolicyDocumentException":
-      throw await de_MalformedPolicyDocumentExceptionRes(parsedOutput, context);
-    case "PackedPolicyTooLarge":
-    case "com.amazonaws.sts#PackedPolicyTooLargeException":
-      throw await de_PackedPolicyTooLargeExceptionRes(parsedOutput, context);
-    case "RegionDisabledException":
-    case "com.amazonaws.sts#RegionDisabledException":
-      throw await de_RegionDisabledExceptionRes(parsedOutput, context);
-    default:
-      const parsedBody = parsedOutput.body;
-      return throwDefaultError({
-        output,
-        parsedBody: parsedBody.Error,
-        errorCode
-      });
-  }
-}, "de_GetFederationTokenCommandError");
 var de_GetSessionTokenCommand = /* @__PURE__ */ __name(async (output, context) => {
   if (output.statusCode >= 300) {
-    return de_GetSessionTokenCommandError(output, context);
+    return de_CommandError(output, context);
   }
   const data = await parseBody(output.body, context);
   let contents = {};
@@ -611,16 +442,37 @@ var de_GetSessionTokenCommand = /* @__PURE__ */ __name(async (output, context) =
   };
   return response;
 }, "de_GetSessionTokenCommand");
-var de_GetSessionTokenCommandError = /* @__PURE__ */ __name(async (output, context) => {
+var de_CommandError = /* @__PURE__ */ __name(async (output, context) => {
   const parsedOutput = {
     ...output,
     body: await parseErrorBody(output.body, context)
   };
   const errorCode = loadQueryErrorCode(output, parsedOutput.body);
   switch (errorCode) {
+    case "ExpiredTokenException":
+    case "com.amazonaws.sts#ExpiredTokenException":
+      throw await de_ExpiredTokenExceptionRes(parsedOutput, context);
+    case "MalformedPolicyDocument":
+    case "com.amazonaws.sts#MalformedPolicyDocumentException":
+      throw await de_MalformedPolicyDocumentExceptionRes(parsedOutput, context);
+    case "PackedPolicyTooLarge":
+    case "com.amazonaws.sts#PackedPolicyTooLargeException":
+      throw await de_PackedPolicyTooLargeExceptionRes(parsedOutput, context);
     case "RegionDisabledException":
     case "com.amazonaws.sts#RegionDisabledException":
       throw await de_RegionDisabledExceptionRes(parsedOutput, context);
+    case "IDPRejectedClaim":
+    case "com.amazonaws.sts#IDPRejectedClaimException":
+      throw await de_IDPRejectedClaimExceptionRes(parsedOutput, context);
+    case "InvalidIdentityToken":
+    case "com.amazonaws.sts#InvalidIdentityTokenException":
+      throw await de_InvalidIdentityTokenExceptionRes(parsedOutput, context);
+    case "IDPCommunicationError":
+    case "com.amazonaws.sts#IDPCommunicationErrorException":
+      throw await de_IDPCommunicationErrorExceptionRes(parsedOutput, context);
+    case "InvalidAuthorizationMessageException":
+    case "com.amazonaws.sts#InvalidAuthorizationMessageException":
+      throw await de_InvalidAuthorizationMessageExceptionRes(parsedOutput, context);
     default:
       const parsedBody = parsedOutput.body;
       return throwDefaultError({
@@ -629,7 +481,7 @@ var de_GetSessionTokenCommandError = /* @__PURE__ */ __name(async (output, conte
         errorCode
       });
   }
-}, "de_GetSessionTokenCommandError");
+}, "de_CommandError");
 var de_ExpiredTokenExceptionRes = /* @__PURE__ */ __name(async (parsedOutput, context) => {
   const body = parsedOutput.body;
   const deserialized = de_ExpiredTokenException(body.Error, context);
@@ -1482,34 +1334,54 @@ var STS = _STS;
 // src/index.ts
 var import_EndpointParameters9 = require("./endpoint/EndpointParameters");
 var import_runtimeExtensions = require("././runtimeExtensions");
-var import_util_endpoints = require("@aws-sdk/util-endpoints");
+
 
 // src/defaultStsRoleAssumers.ts
+var import_util_endpoints = require("@aws-sdk/util-endpoints");
 var ASSUME_ROLE_DEFAULT_REGION = "us-east-1";
-var decorateDefaultRegion = /* @__PURE__ */ __name((region) => {
-  if (typeof region !== "function") {
-    return region === void 0 ? ASSUME_ROLE_DEFAULT_REGION : region;
-  }
-  return async () => {
-    try {
-      return await region();
-    } catch (e) {
-      return ASSUME_ROLE_DEFAULT_REGION;
-    }
-  };
-}, "decorateDefaultRegion");
+var resolveRegion = /* @__PURE__ */ __name(async (_region, _parentRegion, credentialProviderLogger) => {
+  var _a2, _b;
+  const region = typeof _region === "function" ? await _region() : _region;
+  const parentRegion = typeof _parentRegion === "function" ? await _parentRegion() : _parentRegion;
+  if (!parentRegion || (0, import_util_endpoints.partition)(parentRegion).name === "aws") {
+    (_a2 = credentialProviderLogger == null ? void 0 : credentialProviderLogger.debug) == null ? void 0 : _a2.call(
+      credentialProviderLogger,
+      "@aws-sdk/client-sts::resolveRegion",
+      "accepting first of:",
+      `${region} (provider)`,
+      `${ASSUME_ROLE_DEFAULT_REGION} (STS default)`
+    );
+    return region ?? ASSUME_ROLE_DEFAULT_REGION;
+  } else {
+    (_b = credentialProviderLogger == null ? void 0 : credentialProviderLogger.debug) == null ? void 0 : _b.call(
+      credentialProviderLogger,
+      "@aws-sdk/client-sts::resolveRegion",
+      "accepting first of:",
+      `${region} (provider)`,
+      `${parentRegion} (parent client)`,
+      `${ASSUME_ROLE_DEFAULT_REGION} (STS default)`
+    );
+    return region ?? parentRegion ?? ASSUME_ROLE_DEFAULT_REGION;
+  }
+}, "resolveRegion");
 var getDefaultRoleAssumer = /* @__PURE__ */ __name((stsOptions, stsClientCtor) => {
   let stsClient;
   let closureSourceCreds;
   return async (sourceCreds, params) => {
+    var _a2;
     closureSourceCreds = sourceCreds;
     if (!stsClient) {
-      const { logger, region, requestHandler } = stsOptions;
+      const { logger, region, requestHandler, credentialProviderLogger } = stsOptions;
+      const resolvedRegion = await resolveRegion(
+        region,
+        (_a2 = stsOptions == null ? void 0 : stsOptions.parentClientConfig) == null ? void 0 : _a2.region,
+        credentialProviderLogger
+      );
       stsClient = new stsClientCtor({
         logger,
         // A hack to make sts client uses the credential in current closure.
         credentialDefaultProvider: () => async () => closureSourceCreds,
-        region: decorateDefaultRegion(region || stsOptions.region),
+        region: resolvedRegion,
         ...requestHandler ? { requestHandler } : {}
       });
     }
@@ -1530,11 +1402,17 @@ var getDefaultRoleAssumer = /* @__PURE__ */ __name((stsOptions, stsClientCtor) =
 var getDefaultRoleAssumerWithWebIdentity = /* @__PURE__ */ __name((stsOptions, stsClientCtor) => {
   let stsClient;
   return async (params) => {
+    var _a2;
     if (!stsClient) {
-      const { logger, region, requestHandler } = stsOptions;
+      const { logger, region, requestHandler, credentialProviderLogger } = stsOptions;
+      const resolvedRegion = await resolveRegion(
+        region,
+        (_a2 = stsOptions == null ? void 0 : stsOptions.parentClientConfig) == null ? void 0 : _a2.region,
+        credentialProviderLogger
+      );
       stsClient = new stsClientCtor({
         logger,
-        region: decorateDefaultRegion(region || stsOptions.region),
+        region: resolvedRegion,
         ...requestHandler ? { requestHandler } : {}
       });
     }

package/node_modules/@aws-sdk/client-sts/dist-es/defaultStsRoleAssumers.js

@@ -1,18 +1,18 @@
+import { partition } from "@aws-sdk/util-endpoints";
 import { AssumeRoleCommand } from "./commands/AssumeRoleCommand";
 import { AssumeRoleWithWebIdentityCommand, } from "./commands/AssumeRoleWithWebIdentityCommand";
 const ASSUME_ROLE_DEFAULT_REGION = "us-east-1";
-const decorateDefaultRegion = (region) => {
-    if (typeof region !== "function") {
-        return region === undefined ? ASSUME_ROLE_DEFAULT_REGION : region;
+const resolveRegion = async (_region, _parentRegion, credentialProviderLogger) => {
+    const region = typeof _region === "function" ? await _region() : _region;
+    const parentRegion = typeof _parentRegion === "function" ? await _parentRegion() : _parentRegion;
+    if (!parentRegion || partition(parentRegion).name === "aws") {
+        credentialProviderLogger?.debug?.("@aws-sdk/client-sts::resolveRegion", "accepting first of:", `${region} (provider)`, `${ASSUME_ROLE_DEFAULT_REGION} (STS default)`);
+        return region ?? ASSUME_ROLE_DEFAULT_REGION;
+    }
+    else {
+        credentialProviderLogger?.debug?.("@aws-sdk/client-sts::resolveRegion", "accepting first of:", `${region} (provider)`, `${parentRegion} (parent client)`, `${ASSUME_ROLE_DEFAULT_REGION} (STS default)`);
+        return region ?? parentRegion ?? ASSUME_ROLE_DEFAULT_REGION;
     }
-    return async () => {
-        try {
-            return await region();
-        }
-        catch (e) {
-            return ASSUME_ROLE_DEFAULT_REGION;
-        }
-    };
 };
 export const getDefaultRoleAssumer = (stsOptions, stsClientCtor) => {
     let stsClient;
@@ -20,11 +20,12 @@ export const getDefaultRoleAssumer = (stsOptions, stsClientCtor) => {
     return async (sourceCreds, params) => {
         closureSourceCreds = sourceCreds;
         if (!stsClient) {
-            const { logger, region, requestHandler } = stsOptions;
+            const { logger, region, requestHandler, credentialProviderLogger } = stsOptions;
+            const resolvedRegion = await resolveRegion(region, stsOptions?.parentClientConfig?.region, credentialProviderLogger);
             stsClient = new stsClientCtor({
                 logger,
                 credentialDefaultProvider: () => async () => closureSourceCreds,
-                region: decorateDefaultRegion(region || stsOptions.region),
+                region: resolvedRegion,
                 ...(requestHandler ? { requestHandler } : {}),
             });
         }
@@ -45,10 +46,11 @@ export const getDefaultRoleAssumerWithWebIdentity = (stsOptions, stsClientCtor)
     let stsClient;
     return async (params) => {
         if (!stsClient) {
-            const { logger, region, requestHandler } = stsOptions;
+            const { logger, region, requestHandler, credentialProviderLogger } = stsOptions;
+            const resolvedRegion = await resolveRegion(region, stsOptions?.parentClientConfig?.region, credentialProviderLogger);
             stsClient = new stsClientCtor({
                 logger,
-                region: decorateDefaultRegion(region || stsOptions.region),
+                region: resolvedRegion,
                 ...(requestHandler ? { requestHandler } : {}),
             });
         }