@aws-sdk/middleware-bucket-endpoint 3.40.1 → 3.41.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.41.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.40.1...v3.41.0) (2021-11-11)
+
+**Note:** Version bump only for package @aws-sdk/middleware-bucket-endpoint
+
+
+
+
+
 ## [3.40.1](https://github.com/aws/aws-sdk-js-v3/compare/v3.40.0...v3.40.1) (2021-11-08)
 
 

package/dist-cjs/bucketHostname.js

@@ -4,13 +4,11 @@ exports.bucketHostname = void 0;
 const bucketHostnameUtils_1 = require("./bucketHostnameUtils");
 const bucketHostname = (options) => {
     bucketHostnameUtils_1.validateCustomEndpoint(options);
-    const { dualstackEndpoint, baseHostname } = options;
-    const updatedBaseHostname = dualstackEndpoint ? baseHostname.replace(".dualstack", "") : baseHostname;
     return bucketHostnameUtils_1.isBucketNameOptions(options)
         ?
-            getEndpointFromBucketName({ ...options, baseHostname: updatedBaseHostname })
+            getEndpointFromBucketName(options)
         :
-            getEndpointFromArn({ ...options, baseHostname: updatedBaseHostname });
+            getEndpointFromArn(options);
 };
 exports.bucketHostname = bucketHostname;
 const getEndpointFromBucketName = ({ accelerateEndpoint = false, clientRegion: region, baseHostname, bucketName, dualstackEndpoint = false, fipsEndpoint = false, pathStyleEndpoint = false, tlsCompatible = true, isCustomEndpoint = false, }) => {

package/dist-cjs/bucketHostnameUtils.js

@@ -5,7 +5,7 @@ const DOMAIN_PATTERN = /^[a-z0-9][a-z0-9\.\-]{1,61}[a-z0-9]$/;
 const IP_ADDRESS_PATTERN = /(\d+\.){3}\d+/;
 const DOTS_PATTERN = /\.\./;
 exports.DOT_PATTERN = /\./;
-exports.S3_HOSTNAME_PATTERN = /^(.+\.)?s3[.-]([a-z0-9-]+)\./;
+exports.S3_HOSTNAME_PATTERN = /^(.+\.)?s3(-fips)?(\.dualstack)?[.-]([a-z0-9-]+)\./;
 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";
@@ -14,7 +14,7 @@ const isDnsCompatibleBucketName = (bucketName) => DOMAIN_PATTERN.test(bucketName
 exports.isDnsCompatibleBucketName = isDnsCompatibleBucketName;
 const getRegionalSuffix = (hostname) => {
     const parts = hostname.match(exports.S3_HOSTNAME_PATTERN);
-    return [parts[2], hostname.replace(new RegExp(`^${parts[0]}`), "")];
+    return [parts[4], hostname.replace(new RegExp(`^${parts[0]}`), "")];
 };
 const getSuffix = (hostname) => S3_US_EAST_1_ALTNAME_PATTERN.test(hostname) ? ["us-east-1", AWS_PARTITION_SUFFIX] : getRegionalSuffix(hostname);
 exports.getSuffix = getSuffix;

package/dist-es/bucketHostname.js

@@ -2,13 +2,11 @@ import { __assign, __read } from "tslib";
 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);
-    var dualstackEndpoint = options.dualstackEndpoint, baseHostname = options.baseHostname;
-    var updatedBaseHostname = dualstackEndpoint ? baseHostname.replace(".dualstack", "") : baseHostname;
     return isBucketNameOptions(options)
         ?
-            getEndpointFromBucketName(__assign(__assign({}, options), { baseHostname: updatedBaseHostname }))
+            getEndpointFromBucketName(options)
         :
-            getEndpointFromArn(__assign(__assign({}, options), { baseHostname: updatedBaseHostname }));
+            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.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;

package/dist-es/bucketHostnameUtils.js

@@ -3,7 +3,7 @@ var DOMAIN_PATTERN = /^[a-z0-9][a-z0-9\.\-]{1,61}[a-z0-9]$/;
 var IP_ADDRESS_PATTERN = /(\d+\.){3}\d+/;
 var DOTS_PATTERN = /\.\./;
 export var DOT_PATTERN = /\./;
-export var S3_HOSTNAME_PATTERN = /^(.+\.)?s3[.-]([a-z0-9-]+)\./;
+export var S3_HOSTNAME_PATTERN = /^(.+\.)?s3(-fips)?(\.dualstack)?[.-]([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"; };
@@ -12,7 +12,7 @@ export var isDnsCompatibleBucketName = function (bucketName) {
 };
 var getRegionalSuffix = function (hostname) {
     var parts = hostname.match(S3_HOSTNAME_PATTERN);
-    return [parts[2], hostname.replace(new RegExp("^" + parts[0]), "")];
+    return [parts[4], hostname.replace(new RegExp("^" + parts[0]), "")];
 };
 export var getSuffix = function (hostname) {
     return S3_US_EAST_1_ALTNAME_PATTERN.test(hostname) ? ["us-east-1", AWS_PARTITION_SUFFIX] : getRegionalSuffix(hostname);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-bucket-endpoint",
-  "version": "3.40.1",
+  "version": "3.41.0",
   "scripts": {
     "build": "yarn build:cjs && yarn build:es && yarn build:types",
     "build:cjs": "tsc -p tsconfig.cjs.json",