npm - @aws-sdk/middleware-bucket-endpoint - Versions diffs - 3.36.0 → 3.40.0 - Mend

@aws-sdk/middleware-bucket-endpoint 3.36.0 → 3.40.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/CHANGELOG.md +35 -0
package/dist-cjs/NodeDisableMultiregionAccessPointConfigOptions.js +11 -0
package/dist-cjs/NodeUseArnRegionConfigOptions.js +11 -0
package/dist-cjs/bucketEndpointMiddleware.js +12 -7
package/dist-cjs/bucketHostname.js +23 -11
package/dist-cjs/bucketHostnameUtils.js +7 -11
package/dist-cjs/configurations.js +2 -49
package/dist-cjs/index.js +3 -2
package/dist-es/NodeDisableMultiregionAccessPointConfigOptions.js +12 -0
package/dist-es/NodeUseArnRegionConfigOptions.js +10 -0
package/dist-es/bucketEndpointMiddleware.js +97 -83
package/dist-es/bucketHostname.js +26 -14
package/dist-es/bucketHostnameUtils.js +6 -10
package/dist-es/configurations.js +2 -48
package/dist-es/index.js +3 -1
package/dist-types/NodeDisableMultiregionAccessPointConfigOptions.d.ts +4 -0
package/dist-types/NodeUseArnRegionConfigOptions.d.ts +9 -0
package/dist-types/bucketHostnameUtils.d.ts +4 -11
package/dist-types/configurations.d.ts +8 -21
package/dist-types/index.d.ts +3 -1
package/dist-types/ts3.4/NodeDisableMultiregionAccessPointConfigOptions.d.ts +4 -0
package/dist-types/ts3.4/NodeUseArnRegionConfigOptions.d.ts +5 -0
package/dist-types/ts3.4/bucketHostnameUtils.d.ts +14 -65
package/dist-types/ts3.4/configurations.d.ts +18 -62
package/dist-types/ts3.4/index.d.ts +3 -1
package/package.json +7 -6

package/CHANGELOG.md CHANGED Viewed

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [3.40.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.39.0...v3.40.0) (2021-11-05)
+### Bug Fixes
+* **node-config-provider:** move booleanSelector util to platform agnostic package ([#2992](https://github.com/aws/aws-sdk-js-v3/issues/2992)) ([2909c7b](https://github.com/aws/aws-sdk-js-v3/commit/2909c7bf636d78f82aa980588fb44bd17f78e001))
+# [3.39.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.38.0...v3.39.0) (2021-10-29)
+**Note:** Version bump only for package @aws-sdk/middleware-bucket-endpoint
+# [3.38.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.37.0...v3.38.0) (2021-10-22)
+**Note:** Version bump only for package @aws-sdk/middleware-bucket-endpoint
+# [3.37.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.36.1...v3.37.0) (2021-10-15)
+**Note:** Version bump only for package @aws-sdk/middleware-bucket-endpoint
 # [3.36.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.35.0...v3.36.0) (2021-10-08)

package/dist-cjs/NodeDisableMultiregionAccessPointConfigOptions.js ADDED Viewed

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_CONFIG_OPTIONS = exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME = exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME = void 0;
+const util_config_provider_1 = require("@aws-sdk/util-config-provider");
+exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME = "AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS";
+exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME = "s3_disable_multiregion_access_points";
+exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_CONFIG_OPTIONS = {
+    environmentVariableSelector: (env) => util_config_provider_1.booleanSelector(env, exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME, util_config_provider_1.SelectorType.ENV),
+    configFileSelector: (profile) => util_config_provider_1.booleanSelector(profile, exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME, util_config_provider_1.SelectorType.CONFIG),
+    default: false,
+};

package/dist-cjs/NodeUseArnRegionConfigOptions.js ADDED Viewed

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NODE_USE_ARN_REGION_CONFIG_OPTIONS = exports.NODE_USE_ARN_REGION_INI_NAME = exports.NODE_USE_ARN_REGION_ENV_NAME = void 0;
+const util_config_provider_1 = require("@aws-sdk/util-config-provider");
+exports.NODE_USE_ARN_REGION_ENV_NAME = "AWS_S3_USE_ARN_REGION";
+exports.NODE_USE_ARN_REGION_INI_NAME = "s3_use_arn_region";
+exports.NODE_USE_ARN_REGION_CONFIG_OPTIONS = {
+    environmentVariableSelector: (env) => util_config_provider_1.booleanSelector(env, exports.NODE_USE_ARN_REGION_ENV_NAME, util_config_provider_1.SelectorType.ENV),
+    configFileSelector: (profile) => util_config_provider_1.booleanSelector(profile, exports.NODE_USE_ARN_REGION_INI_NAME, util_config_provider_1.SelectorType.CONFIG),
+    default: false,
+};

package/dist-cjs/bucketEndpointMiddleware.js CHANGED Viewed

@@ -4,7 +4,6 @@ exports.getBucketEndpointPlugin = exports.bucketEndpointMiddlewareOptions = expo
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const util_arn_parser_1 = require("@aws-sdk/util-arn-parser");
 const bucketHostname_1 = require("./bucketHostname");
-const bucketHostnameUtils_1 = require("./bucketHostnameUtils");
 const bucketEndpointMiddleware = (options) => (next, context) => async (args) => {
     const { Bucket: bucketName } = args.input;
     let replaceBucketInPath = options.bucketEndpoint;
@@ -15,14 +14,17 @@ const bucketEndpointMiddleware = (options) => (next, context) => async (args) =>
         }
         else if (util_arn_parser_1.validate(bucketName)) {
             const bucketArn = util_arn_parser_1.parse(bucketName);
-            const clientRegion = bucketHostnameUtils_1.getPseudoRegion(await options.region());
-            const { partition, signingRegion = clientRegion } = (await options.regionInfoProvider(clientRegion)) || {};
+            const clientRegion = await options.region();
+            const useDualstackEndpoint = await options.useDualstackEndpoint();
+            const useFipsEndpoint = await options.useFipsEndpoint();
+            const { partition, signingRegion = clientRegion } = (await options.regionInfoProvider(clientRegion, { useDualstackEndpoint, useFipsEndpoint })) || {};
             const useArnRegion = await options.useArnRegion();
-            const { hostname, bucketEndpoint, signingRegion: modifiedSigningRegion, signingService } = bucketHostname_1.bucketHostname({
+            const { hostname, bucketEndpoint, signingRegion: modifiedSigningRegion, signingService, } = bucketHostname_1.bucketHostname({
                 bucketName: bucketArn,
                 baseHostname: request.hostname,
                 accelerateEndpoint: options.useAccelerateEndpoint,
-                dualstackEndpoint: options.useDualstackEndpoint,
+                dualstackEndpoint: useDualstackEndpoint,
+                fipsEndpoint: useFipsEndpoint,
                 pathStyleEndpoint: options.forcePathStyle,
                 tlsCompatible: request.protocol === "https:",
                 useArnRegion,
@@ -42,13 +44,16 @@ const bucketEndpointMiddleware = (options) => (next, context) => async (args) =>
             replaceBucketInPath = bucketEndpoint;
         }
         else {
-            const clientRegion = bucketHostnameUtils_1.getPseudoRegion(await options.region());
+            const clientRegion = await options.region();
+            const dualstackEndpoint = await options.useDualstackEndpoint();
+            const fipsEndpoint = await options.useFipsEndpoint();
             const { hostname, bucketEndpoint } = bucketHostname_1.bucketHostname({
                 bucketName,
                 clientRegion,
                 baseHostname: request.hostname,
                 accelerateEndpoint: options.useAccelerateEndpoint,
-                dualstackEndpoint: options.useDualstackEndpoint,
+                dualstackEndpoint,
+                fipsEndpoint,
                 pathStyleEndpoint: options.forcePathStyle,
                 tlsCompatible: request.protocol === "https:",
                 isCustomEndpoint: options.isCustomEndpoint,

package/dist-cjs/bucketHostname.js CHANGED Viewed

@@ -11,7 +11,7 @@ const bucketHostname = (options) => {
             getEndpointFromArn(options);
 };
 exports.bucketHostname = bucketHostname;
-const getEndpointFromBucketName = ({ accelerateEndpoint = false, clientRegion: region, baseHostname, bucketName, dualstackEndpoint = false, pathStyleEndpoint = false, tlsCompatible = true, isCustomEndpoint = false, }) => {
+const getEndpointFromBucketName = ({ accelerateEndpoint = false, clientRegion: region, baseHostname, bucketName, dualstackEndpoint = false, fipsEndpoint = false, pathStyleEndpoint = false, tlsCompatible = true, isCustomEndpoint = false, }) => {
     const [clientRegion, hostnameSuffix] = isCustomEndpoint ? [region, baseHostname] : bucketHostnameUtils_1.getSuffix(baseHostname);
     if (pathStyleEndpoint || !bucketHostnameUtils_1.isDnsCompatibleBucketName(bucketName) || (tlsCompatible && bucketHostnameUtils_1.DOT_PATTERN.test(bucketName))) {
         return {
@@ -33,7 +33,7 @@ const getEndpointFromBucketName = ({ accelerateEndpoint = false, clientRegion: r
 const getEndpointFromArn = (options) => {
     const { isCustomEndpoint, baseHostname, clientRegion } = options;
     const hostnameSuffix = isCustomEndpoint ? baseHostname : bucketHostnameUtils_1.getSuffixForArnEndpoint(baseHostname)[1];
-    const { pathStyleEndpoint, accelerateEndpoint = false, tlsCompatible = true, bucketName, clientPartition = "aws", } = options;
+    const { pathStyleEndpoint, accelerateEndpoint = false, fipsEndpoint = false, tlsCompatible = true, bucketName, clientPartition = "aws", } = options;
     bucketHostnameUtils_1.validateArnEndpointOptions({ pathStyleEndpoint, accelerateEndpoint, tlsCompatible });
     const { service, partition, accountId, region, resource } = bucketName;
     bucketHostnameUtils_1.validateService(service);
@@ -51,10 +51,16 @@ const getEndpointFromArn = (options) => {
     }
     return getEndpointFromAccessPointArn({ ...options, clientRegion, accesspointName, hostnameSuffix });
 };
-const getEndpointFromObjectLambdaArn = ({ dualstackEndpoint = false, tlsCompatible = true, useArnRegion, clientRegion, clientSigningRegion = clientRegion, accesspointName, bucketName, hostnameSuffix, }) => {
+const getEndpointFromObjectLambdaArn = ({ dualstackEndpoint = false, fipsEndpoint = false, tlsCompatible = true, useArnRegion, clientRegion, clientSigningRegion = clientRegion, accesspointName, bucketName, hostnameSuffix, }) => {
     const { accountId, region, service } = bucketName;
     bucketHostnameUtils_1.validateRegionalClient(clientRegion);
-    bucketHostnameUtils_1.validateRegion(region, { useArnRegion, clientRegion, clientSigningRegion, allowFipsRegion: true });
+    bucketHostnameUtils_1.validateRegion(region, {
+        useArnRegion,
+        clientRegion,
+        clientSigningRegion,
+        allowFipsRegion: true,
+        useFipsEndpoint: fipsEndpoint,
+    });
     bucketHostnameUtils_1.validateNoDualstack(dualstackEndpoint);
     const DNSHostLabel = `${accesspointName}-${accountId}`;
     bucketHostnameUtils_1.validateDNSHostLabel(DNSHostLabel, { tlsCompatible });
@@ -62,7 +68,7 @@ const getEndpointFromObjectLambdaArn = ({ dualstackEndpoint = false, tlsCompatib
     const signingRegion = useArnRegion ? region : clientSigningRegion;
     return {
         bucketEndpoint: true,
-        hostname: `${DNSHostLabel}.${service}${bucketHostnameUtils_1.isFipsRegion(clientRegion) ? "-fips" : ""}.${bucketHostnameUtils_1.getPseudoRegion(endpointRegion)}.${hostnameSuffix}`,
+        hostname: `${DNSHostLabel}.${service}${fipsEndpoint ? "-fips" : ""}.${endpointRegion}.${hostnameSuffix}`,
         signingRegion,
         signingService: service,
     };
@@ -79,9 +85,9 @@ const getEndpointFromMRAPArn = ({ disableMultiregionAccessPoints, dualstackEndpo
         signingRegion: "*",
     };
 };
-const getEndpointFromOutpostArn = ({ useArnRegion, clientRegion, clientSigningRegion = clientRegion, bucketName, outpostId, dualstackEndpoint = false, tlsCompatible = true, accesspointName, isCustomEndpoint, hostnameSuffix, }) => {
+const getEndpointFromOutpostArn = ({ useArnRegion, clientRegion, clientSigningRegion = clientRegion, bucketName, outpostId, dualstackEndpoint = false, fipsEndpoint = false, tlsCompatible = true, accesspointName, isCustomEndpoint, hostnameSuffix, }) => {
     bucketHostnameUtils_1.validateRegionalClient(clientRegion);
-    bucketHostnameUtils_1.validateRegion(bucketName.region, { useArnRegion, clientRegion, clientSigningRegion });
+    bucketHostnameUtils_1.validateRegion(bucketName.region, { useArnRegion, clientRegion, clientSigningRegion, useFipsEndpoint: fipsEndpoint });
     const DNSHostLabel = `${accesspointName}-${bucketName.accountId}`;
     bucketHostnameUtils_1.validateDNSHostLabel(DNSHostLabel, { tlsCompatible });
     const endpointRegion = useArnRegion ? bucketName.region : clientRegion;
@@ -89,7 +95,7 @@ const getEndpointFromOutpostArn = ({ useArnRegion, clientRegion, clientSigningRe
     bucketHostnameUtils_1.validateOutpostService(bucketName.service);
     bucketHostnameUtils_1.validateDNSHostLabel(outpostId, { tlsCompatible });
     bucketHostnameUtils_1.validateNoDualstack(dualstackEndpoint);
-    bucketHostnameUtils_1.validateNoFIPS(endpointRegion);
+    bucketHostnameUtils_1.validateNoFIPS(fipsEndpoint);
     const hostnamePrefix = `${DNSHostLabel}.${outpostId}`;
     return {
         bucketEndpoint: true,
@@ -98,9 +104,15 @@ const getEndpointFromOutpostArn = ({ useArnRegion, clientRegion, clientSigningRe
         signingService: "s3-outposts",
     };
 };
-const getEndpointFromAccessPointArn = ({ useArnRegion, clientRegion, clientSigningRegion = clientRegion, bucketName, dualstackEndpoint = false, tlsCompatible = true, accesspointName, isCustomEndpoint, hostnameSuffix, }) => {
+const getEndpointFromAccessPointArn = ({ useArnRegion, clientRegion, clientSigningRegion = clientRegion, bucketName, dualstackEndpoint = false, fipsEndpoint = false, tlsCompatible = true, accesspointName, isCustomEndpoint, hostnameSuffix, }) => {
     bucketHostnameUtils_1.validateRegionalClient(clientRegion);
-    bucketHostnameUtils_1.validateRegion(bucketName.region, { useArnRegion, clientRegion, clientSigningRegion, allowFipsRegion: true });
+    bucketHostnameUtils_1.validateRegion(bucketName.region, {
+        useArnRegion,
+        clientRegion,
+        clientSigningRegion,
+        allowFipsRegion: true,
+        useFipsEndpoint: fipsEndpoint,
+    });
     const hostnamePrefix = `${accesspointName}-${bucketName.accountId}`;
     bucketHostnameUtils_1.validateDNSHostLabel(hostnamePrefix, { tlsCompatible });
     const endpointRegion = useArnRegion ? bucketName.region : clientRegion;
@@ -110,7 +122,7 @@ const getEndpointFromAccessPointArn = ({ useArnRegion, clientRegion, clientSigni
         bucketEndpoint: true,
         hostname: `${hostnamePrefix}${isCustomEndpoint
             ? ""
-            : `.s3-accesspoint${bucketHostnameUtils_1.isFipsRegion(clientRegion) ? "-fips" : ""}${dualstackEndpoint ? ".dualstack" : ""}.${bucketHostnameUtils_1.getPseudoRegion(endpointRegion)}`}.${hostnameSuffix}`,
+            : `.s3-accesspoint${fipsEndpoint ? "-fips" : ""}${dualstackEndpoint ? ".dualstack" : ""}.${endpointRegion}`}.${hostnameSuffix}`,
         signingRegion,
     };
 };

package/dist-cjs/bucketHostnameUtils.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateMrapAlias = exports.validateNoFIPS = exports.validateNoDualstack = exports.getArnResources = exports.validateCustomEndpoint = exports.validateDNSHostLabel = exports.validateAccountId = exports.isFipsRegion = exports.validateRegionalClient = exports.validateRegion = exports.validatePartition = exports.validateOutpostService = exports.validateS3Service = exports.validateService = exports.validateArnEndpointOptions = exports.getSuffixForArnEndpoint = exports.getSuffix = exports.isDnsCompatibleBucketName = exports.getPseudoRegion = exports.isBucketNameOptions = exports.S3_HOSTNAME_PATTERN = exports.DOT_PATTERN = void 0;
+exports.validateMrapAlias = exports.validateNoFIPS = exports.validateNoDualstack = exports.getArnResources = exports.validateCustomEndpoint = exports.validateDNSHostLabel = exports.validateAccountId = exports.validateRegionalClient = exports.validateRegion = exports.validatePartition = exports.validateOutpostService = exports.validateS3Service = exports.validateService = exports.validateArnEndpointOptions = exports.getSuffixForArnEndpoint = exports.getSuffix = exports.isDnsCompatibleBucketName = exports.isBucketNameOptions = exports.S3_HOSTNAME_PATTERN = exports.DOT_PATTERN = void 0;
 const DOMAIN_PATTERN = /^[a-z0-9][a-z0-9\.\-]{1,61}[a-z0-9]$/;
 const IP_ADDRESS_PATTERN = /(\d+\.){3}\d+/;
 const DOTS_PATTERN = /\.\./;
@@ -10,8 +10,6 @@ const S3_US_EAST_1_ALTNAME_PATTERN = /^s3(-external-1)?\.amazonaws\.com$/;
 const AWS_PARTITION_SUFFIX = "amazonaws.com";
 const isBucketNameOptions = (options) => typeof options.bucketName === "string";
 exports.isBucketNameOptions = isBucketNameOptions;
-const getPseudoRegion = (region) => (exports.isFipsRegion(region) ? region.replace(/fips-|-fips/, "") : region);
-exports.getPseudoRegion = getPseudoRegion;
 const isDnsCompatibleBucketName = (bucketName) => DOMAIN_PATTERN.test(bucketName) && !IP_ADDRESS_PATTERN.test(bucketName) && !DOTS_PATTERN.test(bucketName);
 exports.isDnsCompatibleBucketName = isDnsCompatibleBucketName;
 const getRegionalSuffix = (hostname) => {
@@ -64,7 +62,7 @@ const validateRegion = (region, options) => {
     if (region === "") {
         throw new Error("ARN region is empty");
     }
-    if (exports.isFipsRegion(options.clientRegion)) {
+    if (options.useFipsEndpoint) {
         if (!options.allowFipsRegion) {
             throw new Error("FIPS region is not supported");
         }
@@ -80,14 +78,12 @@ const validateRegion = (region, options) => {
 };
 exports.validateRegion = validateRegion;
 const validateRegionalClient = (region) => {
-    if (["s3-external-1", "aws-global"].includes(exports.getPseudoRegion(region))) {
+    if (["s3-external-1", "aws-global"].includes(region)) {
         throw new Error(`Client region ${region} is not regional`);
     }
 };
 exports.validateRegionalClient = validateRegionalClient;
-const isFipsRegion = (region) => region.startsWith("fips-") || region.endsWith("-fips");
-exports.isFipsRegion = isFipsRegion;
-const isEqualRegions = (regionA, regionB) => regionA === regionB || exports.getPseudoRegion(regionA) === regionB || regionA === exports.getPseudoRegion(regionB);
+const isEqualRegions = (regionA, regionB) => regionA === regionB;
 const validateAccountId = (accountId) => {
     if (!/[0-9]{12}/.exec(accountId)) {
         throw new Error("Access point ARN accountID does not match regex '[0-9]{12}'");
@@ -139,9 +135,9 @@ const validateNoDualstack = (dualstackEndpoint) => {
         throw new Error("Dualstack endpoint is not supported with Outpost or Multi-region Access Point ARN.");
 };
 exports.validateNoDualstack = validateNoDualstack;
-const validateNoFIPS = (region) => {
-    if (exports.isFipsRegion(region !== null && region !== void 0 ? region : ""))
-        throw new Error(`FIPS region is not supported with Outpost, got ${region}`);
+const validateNoFIPS = (useFipsEndpoint) => {
+    if (useFipsEndpoint)
+        throw new Error(`FIPS region is not supported with Outpost.`);
 };
 exports.validateNoFIPS = validateNoFIPS;
 const validateMrapAlias = (name) => {

package/dist-cjs/configurations.js CHANGED Viewed

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_CONFIG_OPTIONS = exports.NODE_USE_ARN_REGION_CONFIG_OPTIONS = exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME = exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME = exports.NODE_USE_ARN_REGION_INI_NAME = exports.NODE_USE_ARN_REGION_ENV_NAME = exports.resolveBucketEndpointConfig = void 0;
+exports.resolveBucketEndpointConfig = void 0;
 function resolveBucketEndpointConfig(input) {
-    const { bucketEndpoint = false, forcePathStyle = false, useAccelerateEndpoint = false, useDualstackEndpoint = false, useArnRegion = false, disableMultiregionAccessPoints = false, } = input;
+    const { bucketEndpoint = false, forcePathStyle = false, useAccelerateEndpoint = false, useArnRegion = false, disableMultiregionAccessPoints = false, } = input;
     return {
         ...input,
         bucketEndpoint,
         forcePathStyle,
         useAccelerateEndpoint,
-        useDualstackEndpoint,
         useArnRegion: typeof useArnRegion === "function" ? useArnRegion : () => Promise.resolve(useArnRegion),
         disableMultiregionAccessPoints: typeof disableMultiregionAccessPoints === "function"
             ? disableMultiregionAccessPoints
@@ -16,49 +15,3 @@ function resolveBucketEndpointConfig(input) {
     };
 }
 exports.resolveBucketEndpointConfig = resolveBucketEndpointConfig;
-exports.NODE_USE_ARN_REGION_ENV_NAME = "AWS_S3_USE_ARN_REGION";
-exports.NODE_USE_ARN_REGION_INI_NAME = "s3_use_arn_region";
-exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME = "AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS";
-exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME = "s3_disable_multiregion_access_points";
-exports.NODE_USE_ARN_REGION_CONFIG_OPTIONS = {
-    environmentVariableSelector: (env) => {
-        if (!Object.prototype.hasOwnProperty.call(env, exports.NODE_USE_ARN_REGION_ENV_NAME))
-            return undefined;
-        if (env[exports.NODE_USE_ARN_REGION_ENV_NAME] === "true")
-            return true;
-        if (env[exports.NODE_USE_ARN_REGION_ENV_NAME] === "false")
-            return false;
-        throw new Error(`Cannot load env ${exports.NODE_USE_ARN_REGION_ENV_NAME}. Expected "true" or "false", got ${env[exports.NODE_USE_ARN_REGION_ENV_NAME]}.`);
-    },
-    configFileSelector: (profile) => {
-        if (!Object.prototype.hasOwnProperty.call(profile, exports.NODE_USE_ARN_REGION_INI_NAME))
-            return undefined;
-        if (profile[exports.NODE_USE_ARN_REGION_INI_NAME] === "true")
-            return true;
-        if (profile[exports.NODE_USE_ARN_REGION_INI_NAME] === "false")
-            return false;
-        throw new Error(`Cannot load shared config entry ${exports.NODE_USE_ARN_REGION_INI_NAME}. Expected "true" or "false", got ${profile[exports.NODE_USE_ARN_REGION_INI_NAME]}.`);
-    },
-    default: false,
-};
-exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_CONFIG_OPTIONS = {
-    environmentVariableSelector: (env) => {
-        if (!Object.prototype.hasOwnProperty.call(env, exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME))
-            return undefined;
-        if (env[exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME] === "true")
-            return true;
-        if (env[exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME] === "false")
-            return false;
-        throw new Error(`Cannot load env ${exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME}. Expected "true" or "false", got ${env[exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME]}.`);
-    },
-    configFileSelector: (profile) => {
-        if (!Object.prototype.hasOwnProperty.call(profile, exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME))
-            return undefined;
-        if (profile[exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME] === "true")
-            return true;
-        if (profile[exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME] === "false")
-            return false;
-        throw new Error(`Cannot load shared config entry ${exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME}. Expected "true" or "false", got ${profile[exports.NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME]}.`);
-    },
-    default: false,
-};

package/dist-cjs/index.js CHANGED Viewed

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateNoFIPS = exports.validateNoDualstack = exports.validateDNSHostLabel = exports.validateRegion = exports.validateAccountId = exports.validatePartition = exports.validateOutpostService = exports.getSuffixForArnEndpoint = exports.getPseudoRegion = exports.getArnResources = void 0;
+exports.validateNoFIPS = exports.validateNoDualstack = exports.validateDNSHostLabel = exports.validateRegion = exports.validateAccountId = exports.validatePartition = exports.validateOutpostService = exports.getSuffixForArnEndpoint = exports.getArnResources = void 0;
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./NodeDisableMultiregionAccessPointConfigOptions"), exports);
+tslib_1.__exportStar(require("./NodeUseArnRegionConfigOptions"), exports);
 tslib_1.__exportStar(require("./bucketEndpointMiddleware"), exports);
 tslib_1.__exportStar(require("./bucketHostname"), exports);
 tslib_1.__exportStar(require("./configurations"), exports);
 var bucketHostnameUtils_1 = require("./bucketHostnameUtils");
 Object.defineProperty(exports, "getArnResources", { enumerable: true, get: function () { return bucketHostnameUtils_1.getArnResources; } });
-Object.defineProperty(exports, "getPseudoRegion", { enumerable: true, get: function () { return bucketHostnameUtils_1.getPseudoRegion; } });
 Object.defineProperty(exports, "getSuffixForArnEndpoint", { enumerable: true, get: function () { return bucketHostnameUtils_1.getSuffixForArnEndpoint; } });
 Object.defineProperty(exports, "validateOutpostService", { enumerable: true, get: function () { return bucketHostnameUtils_1.validateOutpostService; } });
 Object.defineProperty(exports, "validatePartition", { enumerable: true, get: function () { return bucketHostnameUtils_1.validatePartition; } });

package/dist-es/NodeDisableMultiregionAccessPointConfigOptions.js ADDED Viewed

@@ -0,0 +1,12 @@
+import { booleanSelector, SelectorType } from "@aws-sdk/util-config-provider";
+export var NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME = "AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS";
+export var NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME = "s3_disable_multiregion_access_points";
+export var NODE_DISABLE_MULTIREGION_ACCESS_POINT_CONFIG_OPTIONS = {
+    environmentVariableSelector: function (env) {
+        return booleanSelector(env, NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME, SelectorType.ENV);
+    },
+    configFileSelector: function (profile) {
+        return booleanSelector(profile, NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME, SelectorType.CONFIG);
+    },
+    default: false,
+};

package/dist-es/NodeUseArnRegionConfigOptions.js ADDED Viewed

@@ -0,0 +1,10 @@
+import { booleanSelector, SelectorType } from "@aws-sdk/util-config-provider";
+export var NODE_USE_ARN_REGION_ENV_NAME = "AWS_S3_USE_ARN_REGION";
+export var NODE_USE_ARN_REGION_INI_NAME = "s3_use_arn_region";
+export var NODE_USE_ARN_REGION_CONFIG_OPTIONS = {
+    environmentVariableSelector: function (env) {
+        return booleanSelector(env, NODE_USE_ARN_REGION_ENV_NAME, SelectorType.ENV);
+    },
+    configFileSelector: function (profile) { return booleanSelector(profile, NODE_USE_ARN_REGION_INI_NAME, SelectorType.CONFIG); },
+    default: false,
+};

package/dist-es/bucketEndpointMiddleware.js CHANGED Viewed

@@ -2,90 +2,104 @@ import { __assign, __awaiter, __generator } from "tslib";
 import { HttpRequest } from "@aws-sdk/protocol-http";
 import { parse as parseArn, validate as validateArn } from "@aws-sdk/util-arn-parser";
 import { bucketHostname } from "./bucketHostname";
-import { getPseudoRegion } from "./bucketHostnameUtils";
-export var bucketEndpointMiddleware = function (options) { return function (next, context) { return function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var bucketName, replaceBucketInPath, request, bucketArn, clientRegion, _a, _b, partition, _c, signingRegion, useArnRegion, _d, hostname, bucketEndpoint, modifiedSigningRegion, signingService, _e, clientRegion, _f, _g, hostname, bucketEndpoint;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
-            case 0:
-                bucketName = args.input.Bucket;
-                replaceBucketInPath = options.bucketEndpoint;
-                request = args.request;
-                if (!HttpRequest.isInstance(request)) return [3, 9];
-                if (!options.bucketEndpoint) return [3, 1];
-                request.hostname = bucketName;
-                return [3, 8];
-            case 1:
-                if (!validateArn(bucketName)) return [3, 6];
-                bucketArn = parseArn(bucketName);
-                _a = getPseudoRegion;
-                return [4, options.region()];
-            case 2:
-                clientRegion = _a.apply(void 0, [_j.sent()]);
-                return [4, options.regionInfoProvider(clientRegion)];
-            case 3:
-                _b = (_j.sent()) || {}, partition = _b.partition, _c = _b.signingRegion, signingRegion = _c === void 0 ? clientRegion : _c;
-                return [4, options.useArnRegion()];
-            case 4:
-                useArnRegion = _j.sent();
-                _e = bucketHostname;
-                _h = {
-                    bucketName: bucketArn,
-                    baseHostname: request.hostname,
-                    accelerateEndpoint: options.useAccelerateEndpoint,
-                    dualstackEndpoint: options.useDualstackEndpoint,
-                    pathStyleEndpoint: options.forcePathStyle,
-                    tlsCompatible: request.protocol === "https:",
-                    useArnRegion: useArnRegion,
-                    clientPartition: partition,
-                    clientSigningRegion: signingRegion,
-                    clientRegion: clientRegion,
-                    isCustomEndpoint: options.isCustomEndpoint
-                };
-                return [4, options.disableMultiregionAccessPoints()];
-            case 5:
-                _d = _e.apply(void 0, [(_h.disableMultiregionAccessPoints = _j.sent(),
-                        _h)]), hostname = _d.hostname, bucketEndpoint = _d.bucketEndpoint, modifiedSigningRegion = _d.signingRegion, signingService = _d.signingService;
-                if (modifiedSigningRegion && modifiedSigningRegion !== signingRegion) {
-                    context["signing_region"] = modifiedSigningRegion;
+export var bucketEndpointMiddleware = function (options) {
+    return function (next, context) {
+        return function (args) { return __awaiter(void 0, void 0, void 0, function () {
+            var bucketName, replaceBucketInPath, request, bucketArn, clientRegion, useDualstackEndpoint, useFipsEndpoint, _a, partition, _b, signingRegion, useArnRegion, _c, hostname, bucketEndpoint, modifiedSigningRegion, signingService, _d, clientRegion, dualstackEndpoint, fipsEndpoint, _e, hostname, bucketEndpoint;
+            var _f;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        bucketName = args.input.Bucket;
+                        replaceBucketInPath = options.bucketEndpoint;
+                        request = args.request;
+                        if (!HttpRequest.isInstance(request)) return [3, 13];
+                        if (!options.bucketEndpoint) return [3, 1];
+                        request.hostname = bucketName;
+                        return [3, 12];
+                    case 1:
+                        if (!validateArn(bucketName)) return [3, 8];
+                        bucketArn = parseArn(bucketName);
+                        return [4, options.region()];
+                    case 2:
+                        clientRegion = _g.sent();
+                        return [4, options.useDualstackEndpoint()];
+                    case 3:
+                        useDualstackEndpoint = _g.sent();
+                        return [4, options.useFipsEndpoint()];
+                    case 4:
+                        useFipsEndpoint = _g.sent();
+                        return [4, options.regionInfoProvider(clientRegion, { useDualstackEndpoint: useDualstackEndpoint, useFipsEndpoint: useFipsEndpoint })];
+                    case 5:
+                        _a = (_g.sent()) || {}, partition = _a.partition, _b = _a.signingRegion, signingRegion = _b === void 0 ? clientRegion : _b;
+                        return [4, options.useArnRegion()];
+                    case 6:
+                        useArnRegion = _g.sent();
+                        _d = bucketHostname;
+                        _f = {
+                            bucketName: bucketArn,
+                            baseHostname: request.hostname,
+                            accelerateEndpoint: options.useAccelerateEndpoint,
+                            dualstackEndpoint: useDualstackEndpoint,
+                            fipsEndpoint: useFipsEndpoint,
+                            pathStyleEndpoint: options.forcePathStyle,
+                            tlsCompatible: request.protocol === "https:",
+                            useArnRegion: useArnRegion,
+                            clientPartition: partition,
+                            clientSigningRegion: signingRegion,
+                            clientRegion: clientRegion,
+                            isCustomEndpoint: options.isCustomEndpoint
+                        };
+                        return [4, options.disableMultiregionAccessPoints()];
+                    case 7:
+                        _c = _d.apply(void 0, [(_f.disableMultiregionAccessPoints = _g.sent(),
+                                _f)]), hostname = _c.hostname, bucketEndpoint = _c.bucketEndpoint, modifiedSigningRegion = _c.signingRegion, signingService = _c.signingService;
+                        if (modifiedSigningRegion && modifiedSigningRegion !== signingRegion) {
+                            context["signing_region"] = modifiedSigningRegion;
+                        }
+                        if (signingService && signingService !== "s3") {
+                            context["signing_service"] = signingService;
+                        }
+                        request.hostname = hostname;
+                        replaceBucketInPath = bucketEndpoint;
+                        return [3, 12];
+                    case 8: return [4, options.region()];
+                    case 9:
+                        clientRegion = _g.sent();
+                        return [4, options.useDualstackEndpoint()];
+                    case 10:
+                        dualstackEndpoint = _g.sent();
+                        return [4, options.useFipsEndpoint()];
+                    case 11:
+                        fipsEndpoint = _g.sent();
+                        _e = bucketHostname({
+                            bucketName: bucketName,
+                            clientRegion: clientRegion,
+                            baseHostname: request.hostname,
+                            accelerateEndpoint: options.useAccelerateEndpoint,
+                            dualstackEndpoint: dualstackEndpoint,
+                            fipsEndpoint: fipsEndpoint,
+                            pathStyleEndpoint: options.forcePathStyle,
+                            tlsCompatible: request.protocol === "https:",
+                            isCustomEndpoint: options.isCustomEndpoint,
+                        }), hostname = _e.hostname, bucketEndpoint = _e.bucketEndpoint;
+                        request.hostname = hostname;
+                        replaceBucketInPath = bucketEndpoint;
+                        _g.label = 12;
+                    case 12:
+                        if (replaceBucketInPath) {
+                            request.path = request.path.replace(/^(\/)?[^\/]+/, "");
+                            if (request.path === "") {
+                                request.path = "/";
+                            }
+                        }
+                        _g.label = 13;
+                    case 13: return [2, next(__assign(__assign({}, args), { request: request }))];
                 }
-                if (signingService && signingService !== "s3") {
-                    context["signing_service"] = signingService;
-                }
-                request.hostname = hostname;
-                replaceBucketInPath = bucketEndpoint;
-                return [3, 8];
-            case 6:
-                _f = getPseudoRegion;
-                return [4, options.region()];
-            case 7:
-                clientRegion = _f.apply(void 0, [_j.sent()]);
-                _g = bucketHostname({
-                    bucketName: bucketName,
-                    clientRegion: clientRegion,
-                    baseHostname: request.hostname,
-                    accelerateEndpoint: options.useAccelerateEndpoint,
-                    dualstackEndpoint: options.useDualstackEndpoint,
-                    pathStyleEndpoint: options.forcePathStyle,
-                    tlsCompatible: request.protocol === "https:",
-                    isCustomEndpoint: options.isCustomEndpoint,
-                }), hostname = _g.hostname, bucketEndpoint = _g.bucketEndpoint;
-                request.hostname = hostname;
-                replaceBucketInPath = bucketEndpoint;
-                _j.label = 8;
-            case 8:
-                if (replaceBucketInPath) {
-                    request.path = request.path.replace(/^(\/)?[^\/]+/, "");
-                    if (request.path === "") {
-                        request.path = "/";
-                    }
-                }
-                _j.label = 9;
-            case 9: return [2, next(__assign(__assign({}, args), { request: request }))];
-        }
-    });
-}); }; }; };
+            });
+        }); };
+    };
+};
 export var bucketEndpointMiddlewareOptions = {
     tags: ["BUCKET_ENDPOINT"],
     name: "bucketEndpointMiddleware",

package/dist-es/bucketHostname.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { __assign, __read } from "tslib";
-import { DOT_PATTERN, getArnResources, getPseudoRegion, getSuffix, getSuffixForArnEndpoint, isBucketNameOptions, isDnsCompatibleBucketName, isFipsRegion, validateAccountId, validateArnEndpointOptions, validateCustomEndpoint, validateDNSHostLabel, validateMrapAlias, validateNoDualstack, validateNoFIPS, validateOutpostService, validatePartition, validateRegion, validateRegionalClient, validateS3Service, validateService, } from "./bucketHostnameUtils";
+import { DOT_PATTERN, getArnResources, getSuffix, getSuffixForArnEndpoint, isBucketNameOptions, isDnsCompatibleBucketName, validateAccountId, validateArnEndpointOptions, validateCustomEndpoint, validateDNSHostLabel, validateMrapAlias, validateNoDualstack, validateNoFIPS, validateOutpostService, validatePartition, validateRegion, validateRegionalClient, validateS3Service, validateService, } from "./bucketHostnameUtils";
 export var bucketHostname = function (options) {
     validateCustomEndpoint(options);
     return isBucketNameOptions(options)
@@ -9,8 +9,8 @@ export var bucketHostname = function (options) {
             getEndpointFromArn(options);
 };
 var getEndpointFromBucketName = function (_a) {
-    var _b = _a.accelerateEndpoint, accelerateEndpoint = _b === void 0 ? false : _b, region = _a.clientRegion, baseHostname = _a.baseHostname, bucketName = _a.bucketName, _c = _a.dualstackEndpoint, dualstackEndpoint = _c === void 0 ? false : _c, _d = _a.pathStyleEndpoint, pathStyleEndpoint = _d === void 0 ? false : _d, _e = _a.tlsCompatible, tlsCompatible = _e === void 0 ? true : _e, _f = _a.isCustomEndpoint, isCustomEndpoint = _f === void 0 ? false : _f;
-    var _g = __read(isCustomEndpoint ? [region, baseHostname] : getSuffix(baseHostname), 2), clientRegion = _g[0], hostnameSuffix = _g[1];
+    var _b = _a.accelerateEndpoint, accelerateEndpoint = _b === void 0 ? false : _b, region = _a.clientRegion, baseHostname = _a.baseHostname, bucketName = _a.bucketName, _c = _a.dualstackEndpoint, dualstackEndpoint = _c === void 0 ? false : _c, _d = _a.fipsEndpoint, fipsEndpoint = _d === void 0 ? false : _d, _e = _a.pathStyleEndpoint, pathStyleEndpoint = _e === void 0 ? false : _e, _f = _a.tlsCompatible, tlsCompatible = _f === void 0 ? true : _f, _g = _a.isCustomEndpoint, isCustomEndpoint = _g === void 0 ? false : _g;
+    var _h = __read(isCustomEndpoint ? [region, baseHostname] : getSuffix(baseHostname), 2), clientRegion = _h[0], hostnameSuffix = _h[1];
     if (pathStyleEndpoint || !isDnsCompatibleBucketName(bucketName) || (tlsCompatible && DOT_PATTERN.test(bucketName))) {
         return {
             bucketEndpoint: false,
@@ -31,13 +31,13 @@ var getEndpointFromBucketName = function (_a) {
 var getEndpointFromArn = function (options) {
     var isCustomEndpoint = options.isCustomEndpoint, baseHostname = options.baseHostname, clientRegion = options.clientRegion;
     var hostnameSuffix = isCustomEndpoint ? baseHostname : getSuffixForArnEndpoint(baseHostname)[1];
-    var pathStyleEndpoint = options.pathStyleEndpoint, _a = options.accelerateEndpoint, accelerateEndpoint = _a === void 0 ? false : _a, _b = options.tlsCompatible, tlsCompatible = _b === void 0 ? true : _b, bucketName = options.bucketName, _c = options.clientPartition, clientPartition = _c === void 0 ? "aws" : _c;
+    var pathStyleEndpoint = options.pathStyleEndpoint, _a = options.accelerateEndpoint, accelerateEndpoint = _a === void 0 ? false : _a, _b = options.fipsEndpoint, fipsEndpoint = _b === void 0 ? false : _b, _c = options.tlsCompatible, tlsCompatible = _c === void 0 ? true : _c, bucketName = options.bucketName, _d = options.clientPartition, clientPartition = _d === void 0 ? "aws" : _d;
     validateArnEndpointOptions({ pathStyleEndpoint: pathStyleEndpoint, accelerateEndpoint: accelerateEndpoint, tlsCompatible: tlsCompatible });
     var service = bucketName.service, partition = bucketName.partition, accountId = bucketName.accountId, region = bucketName.region, resource = bucketName.resource;
     validateService(service);
     validatePartition(partition, { clientPartition: clientPartition });
     validateAccountId(accountId);
-    var _d = getArnResources(resource), accesspointName = _d.accesspointName, outpostId = _d.outpostId;
+    var _e = getArnResources(resource), accesspointName = _e.accesspointName, outpostId = _e.outpostId;
     if (service === "s3-object-lambda") {
         return getEndpointFromObjectLambdaArn(__assign(__assign({}, options), { tlsCompatible: tlsCompatible, bucketName: bucketName, accesspointName: accesspointName, hostnameSuffix: hostnameSuffix }));
     }
@@ -50,10 +50,16 @@ var getEndpointFromArn = function (options) {
     return getEndpointFromAccessPointArn(__assign(__assign({}, options), { clientRegion: clientRegion, accesspointName: accesspointName, hostnameSuffix: hostnameSuffix }));
 };
 var getEndpointFromObjectLambdaArn = function (_a) {
-    var _b = _a.dualstackEndpoint, dualstackEndpoint = _b === void 0 ? false : _b, _c = _a.tlsCompatible, tlsCompatible = _c === void 0 ? true : _c, useArnRegion = _a.useArnRegion, clientRegion = _a.clientRegion, _d = _a.clientSigningRegion, clientSigningRegion = _d === void 0 ? clientRegion : _d, accesspointName = _a.accesspointName, bucketName = _a.bucketName, hostnameSuffix = _a.hostnameSuffix;
+    var _b = _a.dualstackEndpoint, dualstackEndpoint = _b === void 0 ? false : _b, _c = _a.fipsEndpoint, fipsEndpoint = _c === void 0 ? false : _c, _d = _a.tlsCompatible, tlsCompatible = _d === void 0 ? true : _d, useArnRegion = _a.useArnRegion, clientRegion = _a.clientRegion, _e = _a.clientSigningRegion, clientSigningRegion = _e === void 0 ? clientRegion : _e, accesspointName = _a.accesspointName, bucketName = _a.bucketName, hostnameSuffix = _a.hostnameSuffix;
     var accountId = bucketName.accountId, region = bucketName.region, service = bucketName.service;
     validateRegionalClient(clientRegion);
-    validateRegion(region, { useArnRegion: useArnRegion, clientRegion: clientRegion, clientSigningRegion: clientSigningRegion, allowFipsRegion: true });
+    validateRegion(region, {
+        useArnRegion: useArnRegion,
+        clientRegion: clientRegion,
+        clientSigningRegion: clientSigningRegion,
+        allowFipsRegion: true,
+        useFipsEndpoint: fipsEndpoint,
+    });
     validateNoDualstack(dualstackEndpoint);
     var DNSHostLabel = accesspointName + "-" + accountId;
     validateDNSHostLabel(DNSHostLabel, { tlsCompatible: tlsCompatible });
@@ -61,7 +67,7 @@ var getEndpointFromObjectLambdaArn = function (_a) {
     var signingRegion = useArnRegion ? region : clientSigningRegion;
     return {
         bucketEndpoint: true,
-        hostname: DNSHostLabel + "." + service + (isFipsRegion(clientRegion) ? "-fips" : "") + "." + getPseudoRegion(endpointRegion) + "." + hostnameSuffix,
+        hostname: DNSHostLabel + "." + service + (fipsEndpoint ? "-fips" : "") + "." + endpointRegion + "." + hostnameSuffix,
         signingRegion: signingRegion,
         signingService: service,
     };
@@ -80,9 +86,9 @@ var getEndpointFromMRAPArn = function (_a) {
     };
 };
 var getEndpointFromOutpostArn = function (_a) {
-    var useArnRegion = _a.useArnRegion, clientRegion = _a.clientRegion, _b = _a.clientSigningRegion, clientSigningRegion = _b === void 0 ? clientRegion : _b, bucketName = _a.bucketName, outpostId = _a.outpostId, _c = _a.dualstackEndpoint, dualstackEndpoint = _c === void 0 ? false : _c, _d = _a.tlsCompatible, tlsCompatible = _d === void 0 ? true : _d, accesspointName = _a.accesspointName, isCustomEndpoint = _a.isCustomEndpoint, hostnameSuffix = _a.hostnameSuffix;
+    var useArnRegion = _a.useArnRegion, clientRegion = _a.clientRegion, _b = _a.clientSigningRegion, clientSigningRegion = _b === void 0 ? clientRegion : _b, bucketName = _a.bucketName, outpostId = _a.outpostId, _c = _a.dualstackEndpoint, dualstackEndpoint = _c === void 0 ? false : _c, _d = _a.fipsEndpoint, fipsEndpoint = _d === void 0 ? false : _d, _e = _a.tlsCompatible, tlsCompatible = _e === void 0 ? true : _e, accesspointName = _a.accesspointName, isCustomEndpoint = _a.isCustomEndpoint, hostnameSuffix = _a.hostnameSuffix;
     validateRegionalClient(clientRegion);
-    validateRegion(bucketName.region, { useArnRegion: useArnRegion, clientRegion: clientRegion, clientSigningRegion: clientSigningRegion });
+    validateRegion(bucketName.region, { useArnRegion: useArnRegion, clientRegion: clientRegion, clientSigningRegion: clientSigningRegion, useFipsEndpoint: fipsEndpoint });
     var DNSHostLabel = accesspointName + "-" + bucketName.accountId;
     validateDNSHostLabel(DNSHostLabel, { tlsCompatible: tlsCompatible });
     var endpointRegion = useArnRegion ? bucketName.region : clientRegion;
@@ -90,7 +96,7 @@ var getEndpointFromOutpostArn = function (_a) {
     validateOutpostService(bucketName.service);
     validateDNSHostLabel(outpostId, { tlsCompatible: tlsCompatible });
     validateNoDualstack(dualstackEndpoint);
-    validateNoFIPS(endpointRegion);
+    validateNoFIPS(fipsEndpoint);
     var hostnamePrefix = DNSHostLabel + "." + outpostId;
     return {
         bucketEndpoint: true,
@@ -100,9 +106,15 @@ var getEndpointFromOutpostArn = function (_a) {
     };
 };
 var getEndpointFromAccessPointArn = function (_a) {
-    var useArnRegion = _a.useArnRegion, clientRegion = _a.clientRegion, _b = _a.clientSigningRegion, clientSigningRegion = _b === void 0 ? clientRegion : _b, bucketName = _a.bucketName, _c = _a.dualstackEndpoint, dualstackEndpoint = _c === void 0 ? false : _c, _d = _a.tlsCompatible, tlsCompatible = _d === void 0 ? true : _d, accesspointName = _a.accesspointName, isCustomEndpoint = _a.isCustomEndpoint, hostnameSuffix = _a.hostnameSuffix;
+    var useArnRegion = _a.useArnRegion, clientRegion = _a.clientRegion, _b = _a.clientSigningRegion, clientSigningRegion = _b === void 0 ? clientRegion : _b, bucketName = _a.bucketName, _c = _a.dualstackEndpoint, dualstackEndpoint = _c === void 0 ? false : _c, _d = _a.fipsEndpoint, fipsEndpoint = _d === void 0 ? false : _d, _e = _a.tlsCompatible, tlsCompatible = _e === void 0 ? true : _e, accesspointName = _a.accesspointName, isCustomEndpoint = _a.isCustomEndpoint, hostnameSuffix = _a.hostnameSuffix;
     validateRegionalClient(clientRegion);
-    validateRegion(bucketName.region, { useArnRegion: useArnRegion, clientRegion: clientRegion, clientSigningRegion: clientSigningRegion, allowFipsRegion: true });
+    validateRegion(bucketName.region, {
+        useArnRegion: useArnRegion,
+        clientRegion: clientRegion,
+        clientSigningRegion: clientSigningRegion,
+        allowFipsRegion: true,
+        useFipsEndpoint: fipsEndpoint,
+    });
     var hostnamePrefix = accesspointName + "-" + bucketName.accountId;
     validateDNSHostLabel(hostnamePrefix, { tlsCompatible: tlsCompatible });
     var endpointRegion = useArnRegion ? bucketName.region : clientRegion;
@@ -112,7 +124,7 @@ var getEndpointFromAccessPointArn = function (_a) {
         bucketEndpoint: true,
         hostname: "" + hostnamePrefix + (isCustomEndpoint
             ? ""
-            : ".s3-accesspoint" + (isFipsRegion(clientRegion) ? "-fips" : "") + (dualstackEndpoint ? ".dualstack" : "") + "." + getPseudoRegion(endpointRegion)) + "." + hostnameSuffix,
+            : ".s3-accesspoint" + (fipsEndpoint ? "-fips" : "") + (dualstackEndpoint ? ".dualstack" : "") + "." + endpointRegion) + "." + hostnameSuffix,
         signingRegion: signingRegion,
     };
 };

package/dist-es/bucketHostnameUtils.js CHANGED Viewed

@@ -7,7 +7,6 @@ export var S3_HOSTNAME_PATTERN = /^(.+\.)?s3[.-]([a-z0-9-]+)\./;
 var S3_US_EAST_1_ALTNAME_PATTERN = /^s3(-external-1)?\.amazonaws\.com$/;
 var AWS_PARTITION_SUFFIX = "amazonaws.com";
 export var isBucketNameOptions = function (options) { return typeof options.bucketName === "string"; };
-export var getPseudoRegion = function (region) { return (isFipsRegion(region) ? region.replace(/fips-|-fips/, "") : region); };
 export var isDnsCompatibleBucketName = function (bucketName) {
     return DOMAIN_PATTERN.test(bucketName) && !IP_ADDRESS_PATTERN.test(bucketName) && !DOTS_PATTERN.test(bucketName);
 };
@@ -58,7 +57,7 @@ export var validateRegion = function (region, options) {
     if (region === "") {
         throw new Error("ARN region is empty");
     }
-    if (isFipsRegion(options.clientRegion)) {
+    if (options.useFipsEndpoint) {
         if (!options.allowFipsRegion) {
             throw new Error("FIPS region is not supported");
         }
@@ -73,14 +72,11 @@ export var validateRegion = function (region, options) {
     }
 };
 export var validateRegionalClient = function (region) {
-    if (["s3-external-1", "aws-global"].includes(getPseudoRegion(region))) {
+    if (["s3-external-1", "aws-global"].includes(region)) {
         throw new Error("Client region " + region + " is not regional");
     }
 };
-export var isFipsRegion = function (region) { return region.startsWith("fips-") || region.endsWith("-fips"); };
-var isEqualRegions = function (regionA, regionB) {
-    return regionA === regionB || getPseudoRegion(regionA) === regionB || regionA === getPseudoRegion(regionB);
-};
+var isEqualRegions = function (regionA, regionB) { return regionA === regionB; };
 export var validateAccountId = function (accountId) {
     if (!/[0-9]{12}/.exec(accountId)) {
         throw new Error("Access point ARN accountID does not match regex '[0-9]{12}'");
@@ -128,9 +124,9 @@ export var validateNoDualstack = function (dualstackEndpoint) {
     if (dualstackEndpoint)
         throw new Error("Dualstack endpoint is not supported with Outpost or Multi-region Access Point ARN.");
 };
-export var validateNoFIPS = function (region) {
-    if (isFipsRegion(region !== null && region !== void 0 ? region : ""))
-        throw new Error("FIPS region is not supported with Outpost, got " + region);
+export var validateNoFIPS = function (useFipsEndpoint) {
+    if (useFipsEndpoint)
+        throw new Error("FIPS region is not supported with Outpost.");
 };
 export var validateMrapAlias = function (name) {
     try {

package/dist-es/configurations.js CHANGED Viewed

@@ -1,53 +1,7 @@
 import { __assign } from "tslib";
 export function resolveBucketEndpointConfig(input) {
-    var _a = input.bucketEndpoint, bucketEndpoint = _a === void 0 ? false : _a, _b = input.forcePathStyle, forcePathStyle = _b === void 0 ? false : _b, _c = input.useAccelerateEndpoint, useAccelerateEndpoint = _c === void 0 ? false : _c, _d = input.useDualstackEndpoint, useDualstackEndpoint = _d === void 0 ? false : _d, _e = input.useArnRegion, useArnRegion = _e === void 0 ? false : _e, _f = input.disableMultiregionAccessPoints, disableMultiregionAccessPoints = _f === void 0 ? false : _f;
-    return __assign(__assign({}, input), { bucketEndpoint: bucketEndpoint, forcePathStyle: forcePathStyle, useAccelerateEndpoint: useAccelerateEndpoint, useDualstackEndpoint: useDualstackEndpoint, useArnRegion: typeof useArnRegion === "function" ? useArnRegion : function () { return Promise.resolve(useArnRegion); }, disableMultiregionAccessPoints: typeof disableMultiregionAccessPoints === "function"
+    var _a = input.bucketEndpoint, bucketEndpoint = _a === void 0 ? false : _a, _b = input.forcePathStyle, forcePathStyle = _b === void 0 ? false : _b, _c = input.useAccelerateEndpoint, useAccelerateEndpoint = _c === void 0 ? false : _c, _d = input.useArnRegion, useArnRegion = _d === void 0 ? false : _d, _e = input.disableMultiregionAccessPoints, disableMultiregionAccessPoints = _e === void 0 ? false : _e;
+    return __assign(__assign({}, input), { bucketEndpoint: bucketEndpoint, forcePathStyle: forcePathStyle, useAccelerateEndpoint: useAccelerateEndpoint, useArnRegion: typeof useArnRegion === "function" ? useArnRegion : function () { return Promise.resolve(useArnRegion); }, disableMultiregionAccessPoints: typeof disableMultiregionAccessPoints === "function"
             ? disableMultiregionAccessPoints
             : function () { return Promise.resolve(disableMultiregionAccessPoints); } });
 }
-export var NODE_USE_ARN_REGION_ENV_NAME = "AWS_S3_USE_ARN_REGION";
-export var NODE_USE_ARN_REGION_INI_NAME = "s3_use_arn_region";
-export var NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME = "AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS";
-export var NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME = "s3_disable_multiregion_access_points";
-export var NODE_USE_ARN_REGION_CONFIG_OPTIONS = {
-    environmentVariableSelector: function (env) {
-        if (!Object.prototype.hasOwnProperty.call(env, NODE_USE_ARN_REGION_ENV_NAME))
-            return undefined;
-        if (env[NODE_USE_ARN_REGION_ENV_NAME] === "true")
-            return true;
-        if (env[NODE_USE_ARN_REGION_ENV_NAME] === "false")
-            return false;
-        throw new Error("Cannot load env " + NODE_USE_ARN_REGION_ENV_NAME + ". Expected \"true\" or \"false\", got " + env[NODE_USE_ARN_REGION_ENV_NAME] + ".");
-    },
-    configFileSelector: function (profile) {
-        if (!Object.prototype.hasOwnProperty.call(profile, NODE_USE_ARN_REGION_INI_NAME))
-            return undefined;
-        if (profile[NODE_USE_ARN_REGION_INI_NAME] === "true")
-            return true;
-        if (profile[NODE_USE_ARN_REGION_INI_NAME] === "false")
-            return false;
-        throw new Error("Cannot load shared config entry " + NODE_USE_ARN_REGION_INI_NAME + ". Expected \"true\" or \"false\", got " + profile[NODE_USE_ARN_REGION_INI_NAME] + ".");
-    },
-    default: false,
-};
-export var NODE_DISABLE_MULTIREGION_ACCESS_POINT_CONFIG_OPTIONS = {
-    environmentVariableSelector: function (env) {
-        if (!Object.prototype.hasOwnProperty.call(env, NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME))
-            return undefined;
-        if (env[NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME] === "true")
-            return true;
-        if (env[NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME] === "false")
-            return false;
-        throw new Error("Cannot load env " + NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME + ". Expected \"true\" or \"false\", got " + env[NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME] + ".");
-    },
-    configFileSelector: function (profile) {
-        if (!Object.prototype.hasOwnProperty.call(profile, NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME))
-            return undefined;
-        if (profile[NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME] === "true")
-            return true;
-        if (profile[NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME] === "false")
-            return false;
-        throw new Error("Cannot load shared config entry " + NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME + ". Expected \"true\" or \"false\", got " + profile[NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME] + ".");
-    },
-    default: false,
-};

package/dist-es/index.js CHANGED Viewed

@@ -1,4 +1,6 @@
+export * from "./NodeDisableMultiregionAccessPointConfigOptions";
+export * from "./NodeUseArnRegionConfigOptions";
 export * from "./bucketEndpointMiddleware";
 export * from "./bucketHostname";
 export * from "./configurations";
-export { getArnResources, getPseudoRegion, getSuffixForArnEndpoint, validateOutpostService, validatePartition, validateAccountId, validateRegion, validateDNSHostLabel, validateNoDualstack, validateNoFIPS, } from "./bucketHostnameUtils";
+export { getArnResources, getSuffixForArnEndpoint, validateOutpostService, validatePartition, validateAccountId, validateRegion, validateDNSHostLabel, validateNoDualstack, validateNoFIPS, } from "./bucketHostnameUtils";

package/dist-types/NodeDisableMultiregionAccessPointConfigOptions.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import { LoadedConfigSelectors } from "@aws-sdk/node-config-provider";
+export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME = "AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS";
+export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME = "s3_disable_multiregion_access_points";
+export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_CONFIG_OPTIONS: LoadedConfigSelectors<boolean>;

package/dist-types/NodeUseArnRegionConfigOptions.d.ts ADDED Viewed

@@ -0,0 +1,9 @@
+import { LoadedConfigSelectors } from "@aws-sdk/node-config-provider";
+export declare const NODE_USE_ARN_REGION_ENV_NAME = "AWS_S3_USE_ARN_REGION";
+export declare const NODE_USE_ARN_REGION_INI_NAME = "s3_use_arn_region";
+/**
+ * Config to load useArnRegion from environment variables and shared INI files
+ *
+ * @api private
+ */
+export declare const NODE_USE_ARN_REGION_CONFIG_OPTIONS: LoadedConfigSelectors<boolean>;

package/dist-types/bucketHostnameUtils.d.ts CHANGED Viewed

@@ -11,6 +11,7 @@ export interface BucketHostnameParams {
     clientRegion: string;
     accelerateEndpoint?: boolean;
     dualstackEndpoint?: boolean;
+    fipsEndpoint?: boolean;
     pathStyleEndpoint?: boolean;
     tlsCompatible?: boolean;
 }
@@ -22,11 +23,6 @@ export interface ArnHostnameParams extends Omit<BucketHostnameParams, "bucketNam
     disableMultiregionAccessPoints?: boolean;
 }
 export declare const isBucketNameOptions: (options: BucketHostnameParams | ArnHostnameParams) => options is BucketHostnameParams;
-/**
- * Get pseudo region from supplied region. For example, if supplied with `fips-us-west-2`, it returns `us-west-2`.
- * @internal
- */
-export declare const getPseudoRegion: (region: string) => string;
 /**
  * Determines whether a given string is DNS compliant per the rules outlined by
  * S3. Length, capitaization, and leading dot restrictions are enforced by the
@@ -70,16 +66,13 @@ export declare const validateRegion: (region: string, options: {
     allowFipsRegion?: boolean;
     clientRegion: string;
     clientSigningRegion: string;
+    useFipsEndpoint: boolean;
 }) => void;
 /**
  *
  * @param region
  */
 export declare const validateRegionalClient: (region: string) => void;
-/**
- * @internal
- */
-export declare const isFipsRegion: (region: string) => boolean;
 /**
  * Validate an account ID
  * @internal
@@ -114,10 +107,10 @@ export declare const getArnResources: (resource: string) => {
  */
 export declare const validateNoDualstack: (dualstackEndpoint?: boolean | undefined) => void;
 /**
- * Validate region is not appended or prepended with a `fips-`
+ * Validate fips endpoint is not set up.
  * @internal
  */
-export declare const validateNoFIPS: (region?: string | undefined) => void;
+export declare const validateNoFIPS: (useFipsEndpoint?: boolean | undefined) => void;
 /**
  * Validate the multi-region access point alias.
  * @private

package/dist-types/configurations.d.ts CHANGED Viewed

@@ -1,4 +1,3 @@
-import { LoadedConfigSelectors } from "@aws-sdk/node-config-provider";
 import { Provider, RegionInfoProvider } from "@aws-sdk/types";
 export interface BucketEndpointInputConfig {
     /**
@@ -13,13 +12,6 @@ export interface BucketEndpointInputConfig {
      * Whether to use the S3 Transfer Acceleration endpoint by default
      */
     useAccelerateEndpoint?: boolean;
-    /**
-     * Enables IPv6/IPv4 dualstack endpoint. When a DNS lookup is performed on an endpoint of this type, it returns an “A”
-     * record with an IPv4 address and an “AAAA” record with an IPv6 address. In most cases the network stack in the
-     * client environment will automatically prefer the AAAA record and make a connection using the IPv6 address. Note,
-     * however, that currently on Windows, the IPv4 address will be preferred.
-     */
-    useDualstackEndpoint?: boolean;
     /**
      * Whether to override the request region with the region inferred from requested resource's ARN. Defaults to false
      */
@@ -34,6 +26,8 @@ interface PreviouslyResolved {
     isCustomEndpoint: boolean;
     region: Provider<string>;
     regionInfoProvider: RegionInfoProvider;
+    useFipsEndpoint: Provider<boolean>;
+    useDualstackEndpoint: Provider<boolean>;
 }
 export interface BucketEndpointResolvedConfig {
     /**
@@ -54,9 +48,13 @@ export interface BucketEndpointResolvedConfig {
      */
     useAccelerateEndpoint: boolean;
     /**
-     * Resolved value for input config {@link BucketEndpointInputConfig.useDualstackEndpoint}
+     * Enables FIPS compatible endpoints.
+     */
+    useFipsEndpoint: Provider<boolean>;
+    /**
+     * Enables IPv6/IPv4 dualstack endpoint.
      */
-    useDualstackEndpoint: boolean;
+    useDualstackEndpoint: Provider<boolean>;
     /**
      * Resolved value for input config {@link BucketEndpointInputConfig.useArnRegion}
      */
@@ -73,15 +71,4 @@ export interface BucketEndpointResolvedConfig {
     disableMultiregionAccessPoints: Provider<boolean>;
 }
 export declare function resolveBucketEndpointConfig<T>(input: T & PreviouslyResolved & BucketEndpointInputConfig): T & BucketEndpointResolvedConfig;
-export declare const NODE_USE_ARN_REGION_ENV_NAME = "AWS_S3_USE_ARN_REGION";
-export declare const NODE_USE_ARN_REGION_INI_NAME = "s3_use_arn_region";
-export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME = "AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS";
-export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME = "s3_disable_multiregion_access_points";
-/**
- * Config to load useArnRegion from environment variables and shared INI files
- *
- * @api private
- */
-export declare const NODE_USE_ARN_REGION_CONFIG_OPTIONS: LoadedConfigSelectors<boolean>;
-export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_CONFIG_OPTIONS: LoadedConfigSelectors<boolean>;
 export {};

package/dist-types/index.d.ts CHANGED Viewed

@@ -1,4 +1,6 @@
+export * from "./NodeDisableMultiregionAccessPointConfigOptions";
+export * from "./NodeUseArnRegionConfigOptions";
 export * from "./bucketEndpointMiddleware";
 export * from "./bucketHostname";
 export * from "./configurations";
-export { getArnResources, getPseudoRegion, getSuffixForArnEndpoint, validateOutpostService, validatePartition, validateAccountId, validateRegion, validateDNSHostLabel, validateNoDualstack, validateNoFIPS, } from "./bucketHostnameUtils";
+export { getArnResources, getSuffixForArnEndpoint, validateOutpostService, validatePartition, validateAccountId, validateRegion, validateDNSHostLabel, validateNoDualstack, validateNoFIPS, } from "./bucketHostnameUtils";

package/dist-types/ts3.4/NodeDisableMultiregionAccessPointConfigOptions.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import { LoadedConfigSelectors } from "@aws-sdk/node-config-provider";
+export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME = "AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS";
+export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME = "s3_disable_multiregion_access_points";
+export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_CONFIG_OPTIONS: LoadedConfigSelectors<boolean>;

package/dist-types/ts3.4/NodeUseArnRegionConfigOptions.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+import { LoadedConfigSelectors } from "@aws-sdk/node-config-provider";
+export declare const NODE_USE_ARN_REGION_ENV_NAME = "AWS_S3_USE_ARN_REGION";
+export declare const NODE_USE_ARN_REGION_INI_NAME = "s3_use_arn_region";
+export declare const NODE_USE_ARN_REGION_CONFIG_OPTIONS: LoadedConfigSelectors<boolean>;

package/dist-types/ts3.4/bucketHostnameUtils.d.ts CHANGED Viewed

@@ -11,6 +11,7 @@ export interface BucketHostnameParams {
     clientRegion: string;
     accelerateEndpoint?: boolean;
     dualstackEndpoint?: boolean;
+    fipsEndpoint?: boolean;
     pathStyleEndpoint?: boolean;
     tlsCompatible?: boolean;
 }
@@ -22,30 +23,13 @@ export interface ArnHostnameParams extends Pick<BucketHostnameParams, Exclude<ke
     disableMultiregionAccessPoints?: boolean;
 }
 export declare const isBucketNameOptions: (options: BucketHostnameParams | ArnHostnameParams) => options is BucketHostnameParams;
-/**
- * Get pseudo region from supplied region. For example, if supplied with `fips-us-west-2`, it returns `us-west-2`.
- * @internal
- */
-export declare const getPseudoRegion: (region: string) => string;
-/**
- * Determines whether a given string is DNS compliant per the rules outlined by
- * S3. Length, capitaization, and leading dot restrictions are enforced by the
- * DOMAIN_PATTERN regular expression.
- * @internal
- *
- * @see https://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html
- */
 export declare const isDnsCompatibleBucketName: (bucketName: string) => boolean;
 export declare const getSuffix: (hostname: string) => [
     string,
     string
 ];
-/**
- * Infer region and hostname suffix from a complete hostname
- * @internal
- * @param hostname - Hostname
- * @returns [Region, Hostname suffix]
- */
 export declare const getSuffixForArnEndpoint: (hostname: string) => [
     string,
     string
@@ -58,43 +42,23 @@ export declare const validateArnEndpointOptions: (options: {
 export declare const validateService: (service: string) => void;
 export declare const validateS3Service: (service: string) => void;
 export declare const validateOutpostService: (service: string) => void;
-/**
- * Validate partition inferred from ARN is the same to `options.clientPartition`.
- * @internal
- */
 export declare const validatePartition: (partition: string, options: {
     clientPartition: string;
 }) => void;
-/**
- * validate region value inferred from ARN. If `options.useArnRegion` is set, it validates the region is not a FIPS
- * region. If `options.useArnRegion` is unset, it validates the region is equal to `options.clientRegion` or
- * `options.clientSigningRegion`.
- * @internal
- */
 export declare const validateRegion: (region: string, options: {
     useArnRegion?: boolean;
     allowFipsRegion?: boolean;
     clientRegion: string;
     clientSigningRegion: string;
+    useFipsEndpoint: boolean;
 }) => void;
-/**
- *
- * @param region
- */
 export declare const validateRegionalClient: (region: string) => void;
-/**
- * @internal
- */
-export declare const isFipsRegion: (region: string) => boolean;
-/**
- * Validate an account ID
- * @internal
- */
 export declare const validateAccountId: (accountId: string) => void;
-/**
- * Validate a host label according to https://tools.ietf.org/html/rfc3986#section-3.2.2
- * @internal
- */
 export declare const validateDNSHostLabel: (label: string, options?: {
     tlsCompatible?: boolean;
 }) => void;
@@ -103,29 +67,14 @@ export declare const validateCustomEndpoint: (options: {
     dualstackEndpoint?: boolean;
     accelerateEndpoint?: boolean;
 }) => void;
-/**
- * Validate and parse an Access Point ARN or Outposts ARN
- * @internal
- *
- * @param resource - The resource section of an ARN
- * @returns Access Point Name and optional Outpost ID.
- */
 export declare const getArnResources: (resource: string) => {
     accesspointName: string;
     outpostId?: string;
 };
-/**
- * Throw if dual stack configuration is set to true.
- * @internal
- */
 export declare const validateNoDualstack: (dualstackEndpoint?: boolean | undefined) => void;
-/**
- * Validate region is not appended or prepended with a `fips-`
- * @internal
- */
-export declare const validateNoFIPS: (region?: string | undefined) => void;
-/**
- * Validate the multi-region access point alias.
- * @private
- */
+export declare const validateNoFIPS: (useFipsEndpoint?: boolean | undefined) => void;
 export declare const validateMrapAlias: (name: string) => void;

package/dist-types/ts3.4/configurations.d.ts CHANGED Viewed

@@ -1,87 +1,43 @@
-import { LoadedConfigSelectors } from "@aws-sdk/node-config-provider";
 import { Provider, RegionInfoProvider } from "@aws-sdk/types";
 export interface BucketEndpointInputConfig {
-    /**
-     * Whether the provided endpoint addresses an individual bucket.
-     */
     bucketEndpoint?: boolean;
-    /**
-     * Whether to force path style URLs for S3 objects (e.g., https://s3.amazonaws.com/<bucketName>/<key> instead of https://<bucketName>.s3.amazonaws.com/<key>
-     */
     forcePathStyle?: boolean;
-    /**
-     * Whether to use the S3 Transfer Acceleration endpoint by default
-     */
     useAccelerateEndpoint?: boolean;
-    /**
-     * Enables IPv6/IPv4 dualstack endpoint. When a DNS lookup is performed on an endpoint of this type, it returns an “A”
-     * record with an IPv4 address and an “AAAA” record with an IPv6 address. In most cases the network stack in the
-     * client environment will automatically prefer the AAAA record and make a connection using the IPv6 address. Note,
-     * however, that currently on Windows, the IPv4 address will be preferred.
-     */
-    useDualstackEndpoint?: boolean;
-    /**
-     * Whether to override the request region with the region inferred from requested resource's ARN. Defaults to false
-     */
     useArnRegion?: boolean | Provider<boolean>;
-    /**
-     * Whether to prevent SDK from making cross-region request when supplied bucket is a multi-region access point ARN.
-     * Defaults to false
-     */
     disableMultiregionAccessPoints?: boolean | Provider<boolean>;
 }
 interface PreviouslyResolved {
     isCustomEndpoint: boolean;
     region: Provider<string>;
     regionInfoProvider: RegionInfoProvider;
+    useFipsEndpoint: Provider<boolean>;
+    useDualstackEndpoint: Provider<boolean>;
 }
 export interface BucketEndpointResolvedConfig {
-    /**
-     * Whether the endpoint is specified by caller.
-     * @internal
-     */
     isCustomEndpoint: boolean;
-    /**
-     * Resolved value for input config {@link BucketEndpointInputConfig.bucketEndpoint}
-     */
     bucketEndpoint: boolean;
-    /**
-     * Resolved value for input config {@link BucketEndpointInputConfig.forcePathStyle}
-     */
     forcePathStyle: boolean;
-    /**
-     * Resolved value for input config {@link BucketEndpointInputConfig.useAccelerateEndpoint}
-     */
     useAccelerateEndpoint: boolean;
-    /**
-     * Resolved value for input config {@link BucketEndpointInputConfig.useDualstackEndpoint}
-     */
-    useDualstackEndpoint: boolean;
-    /**
-     * Resolved value for input config {@link BucketEndpointInputConfig.useArnRegion}
-     */
+    useFipsEndpoint: Provider<boolean>;
+    useDualstackEndpoint: Provider<boolean>;
     useArnRegion: Provider<boolean>;
-    /**
-     * Resolved value for input config {@link RegionInputConfig.region}
-     */
     region: Provider<string>;
-    /**
-     * Fetch related hostname, signing name or signing region with given region.
-     * @internal
-     */
     regionInfoProvider: RegionInfoProvider;
     disableMultiregionAccessPoints: Provider<boolean>;
 }
 export declare function resolveBucketEndpointConfig<T>(input: T & PreviouslyResolved & BucketEndpointInputConfig): T & BucketEndpointResolvedConfig;
-export declare const NODE_USE_ARN_REGION_ENV_NAME = "AWS_S3_USE_ARN_REGION";
-export declare const NODE_USE_ARN_REGION_INI_NAME = "s3_use_arn_region";
-export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_ENV_NAME = "AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS";
-export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_INI_NAME = "s3_disable_multiregion_access_points";
-/**
- * Config to load useArnRegion from environment variables and shared INI files
- *
- * @api private
- */
-export declare const NODE_USE_ARN_REGION_CONFIG_OPTIONS: LoadedConfigSelectors<boolean>;
-export declare const NODE_DISABLE_MULTIREGION_ACCESS_POINT_CONFIG_OPTIONS: LoadedConfigSelectors<boolean>;
 export {};

package/dist-types/ts3.4/index.d.ts CHANGED Viewed

@@ -1,4 +1,6 @@
+export * from "./NodeDisableMultiregionAccessPointConfigOptions";
+export * from "./NodeUseArnRegionConfigOptions";
 export * from "./bucketEndpointMiddleware";
 export * from "./bucketHostname";
 export * from "./configurations";
-export { getArnResources, getPseudoRegion, getSuffixForArnEndpoint, validateOutpostService, validatePartition, validateAccountId, validateRegion, validateDNSHostLabel, validateNoDualstack, validateNoFIPS, } from "./bucketHostnameUtils";
+export { getArnResources, getSuffixForArnEndpoint, validateOutpostService, validatePartition, validateAccountId, validateRegion, validateDNSHostLabel, validateNoDualstack, validateNoFIPS, } from "./bucketHostnameUtils";

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-bucket-endpoint",
-  "version": "3.36.0",
+  "version": "3.40.0",
   "scripts": {
     "build": "yarn build:cjs && yarn build:es && yarn build:types",
     "build:cjs": "tsc -p tsconfig.cjs.json",
@@ -18,14 +18,15 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/protocol-http": "3.36.0",
-    "@aws-sdk/types": "3.36.0",
-    "@aws-sdk/util-arn-parser": "3.36.0",
+    "@aws-sdk/protocol-http": "3.40.0",
+    "@aws-sdk/types": "3.40.0",
+    "@aws-sdk/util-arn-parser": "3.37.0",
+    "@aws-sdk/util-config-provider": "3.40.0",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@aws-sdk/middleware-stack": "3.36.0",
-    "@aws-sdk/node-config-provider": "3.36.0",
+    "@aws-sdk/middleware-stack": "3.40.0",
+    "@aws-sdk/node-config-provider": "3.40.0",
     "@types/jest": "^26.0.4",
     "jest": "^26.1.0",
     "typescript": "~4.3.5"