@aws-sdk/util-endpoints 3.188.0 → 3.192.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.192.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.191.0...v3.192.0) (2022-10-19)
+
+
+### Bug Fixes
+
+* **endpoint:** dedupe clientContext/builtIn params, fix s3 unit test ([#4051](https://github.com/aws/aws-sdk-js-v3/issues/4051)) ([947c8bc](https://github.com/aws/aws-sdk-js-v3/commit/947c8bce2798ae5ddc022d34f62aeeb60b4e6fde))
+
+
+
+
+
+# [3.190.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.189.0...v3.190.0) (2022-10-17)
+
+
+### Bug Fixes
+
+* **endpoint:** endpoints 2.0 all-service TS compilation fixes ([#4043](https://github.com/aws/aws-sdk-js-v3/issues/4043)) ([f2da618](https://github.com/aws/aws-sdk-js-v3/commit/f2da6182298d4d6b02e84fb723492c07c27469a8))
+
+
+
+
+
 # [3.188.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.187.0...v3.188.0) (2022-10-13)
 
 

package/dist-cjs/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./lib/aws/partition"), exports);
 tslib_1.__exportStar(require("./resolveEndpoint"), exports);
 tslib_1.__exportStar(require("./types"), exports);

package/dist-cjs/lib/aws/partition.js

@@ -5,11 +5,10 @@ const partitions_json_1 = require("./partitions.json");
 const DEFAULT_PARTITION = partitions_json_1.partitions.find((partition) => partition.id === "aws");
 const partition = (value) => {
     for (const partition of partitions_json_1.partitions) {
-        const { id, regions, outputs } = partition;
+        const { regions, outputs } = partition;
         for (const [region, regionData] of Object.entries(regions)) {
             if (region === value) {
                 return {
-                    name: id,
                     ...outputs,
                     ...regionData,
                 };
@@ -17,10 +16,9 @@ const partition = (value) => {
         }
     }
     for (const partition of partitions_json_1.partitions) {
-        const { id, regionRegex, outputs } = partition;
+        const { regionRegex, outputs } = partition;
         if (new RegExp(regionRegex).test(value)) {
             return {
-                name: id,
                 ...outputs,
             };
         }
@@ -30,7 +28,6 @@ const partition = (value) => {
             " and default partition with id 'aws' doesn't exist.");
     }
     return {
-        name: DEFAULT_PARTITION.id,
         ...DEFAULT_PARTITION.outputs,
     };
 };

package/dist-cjs/lib/aws/partitions.json

@@ -30,6 +30,7 @@
                 "aws-global": {}
             },
             "outputs": {
+                "name": "aws",
                 "dnsSuffix": "amazonaws.com",
                 "dualStackDnsSuffix": "api.aws",
                 "supportsFIPS": true,
@@ -45,6 +46,7 @@
                 "aws-us-gov-global": {}
             },
             "outputs": {
+                "name": "aws-us-gov",
                 "dnsSuffix": "amazonaws.com",
                 "dualStackDnsSuffix": "api.aws",
                 "supportsFIPS": true,
@@ -60,6 +62,7 @@
                 "aws-cn-global": {}
             },
             "outputs": {
+                "name": "aws-cn",
                 "dnsSuffix": "amazonaws.com.cn",
                 "dualStackDnsSuffix": "api.amazonwebservices.com.cn",
                 "supportsFIPS": true,
@@ -70,23 +73,29 @@
             "id": "aws-iso",
             "regionRegex": "^us\\-iso\\-\\w+\\-\\d+$",
             "outputs": {
+                "name": "aws-iso",
                 "dnsSuffix": "c2s.ic.gov",
                 "supportsFIPS": true,
                 "supportsDualStack": false,
                 "dualStackDnsSuffix": "c2s.ic.gov"
             },
-            "regions": {}
+            "regions": {
+                "aws-iso-global": {}
+            }
         },
         {
             "id": "aws-iso-b",
             "regionRegex": "^us\\-isob\\-\\w+\\-\\d+$",
             "outputs": {
+                "name": "aws-iso-b",
                 "dnsSuffix": "sc2s.sgov.gov",
                 "supportsFIPS": true,
                 "supportsDualStack": false,
                 "dualStackDnsSuffix": "sc2s.sgov.gov"
             },
-            "regions": {}
+            "regions": {
+                "aws-iso-b-global": {}
+            }
         }
     ]
 }

package/dist-cjs/lib/parseURL.js

@@ -10,6 +10,17 @@ const DEFAULT_PORTS = {
 const parseURL = (value) => {
     const whatwgURL = (() => {
         try {
+            if (value instanceof URL) {
+                return value;
+            }
+            if (typeof value === "object" && "hostname" in value) {
+                const { hostname, port, protocol = "", path = "", query = {} } = value;
+                const url = new URL(`${protocol}//${hostname}${port ? `:${port}` : ""}${path}`);
+                url.search = Object.entries(query)
+                    .map(([k, v]) => `${k}=${v}`)
+                    .join("&");
+                return url;
+            }
             return new URL(value);
         }
         catch (error) {
@@ -17,8 +28,10 @@ const parseURL = (value) => {
         }
     })();
     if (!whatwgURL) {
+        console.error(`Unable to parse ${JSON.stringify(value)} as a whatwg URL.`);
         return null;
     }
+    const urlString = whatwgURL.href;
     const { host, hostname, pathname, protocol, search } = whatwgURL;
     if (search) {
         return null;
@@ -28,7 +41,9 @@ const parseURL = (value) => {
         return null;
     }
     const isIp = (0, isIpAddress_1.isIpAddress)(hostname);
-    const authority = `${host}${value.includes(`${host}:${DEFAULT_PORTS[scheme]}`) ? `:${DEFAULT_PORTS[scheme]}` : ``}`;
+    const inputContainsDefaultPort = urlString.includes(`${host}:${DEFAULT_PORTS[scheme]}`) ||
+        (typeof value === "string" && value.includes(`${host}:${DEFAULT_PORTS[scheme]}`));
+    const authority = `${host}${inputContainsDefaultPort ? `:${DEFAULT_PORTS[scheme]}` : ``}`;
     return {
         scheme,
         authority,

package/dist-es/index.js

@@ -1,2 +1,3 @@
+export * from "./lib/aws/partition";
 export * from "./resolveEndpoint";
 export * from "./types";

package/dist-es/lib/aws/partition.js

@@ -2,11 +2,10 @@ import { partitions } from "./partitions.json";
 const DEFAULT_PARTITION = partitions.find((partition) => partition.id === "aws");
 export const partition = (value) => {
     for (const partition of partitions) {
-        const { id, regions, outputs } = partition;
+        const { regions, outputs } = partition;
         for (const [region, regionData] of Object.entries(regions)) {
             if (region === value) {
                 return {
-                    name: id,
                     ...outputs,
                     ...regionData,
                 };
@@ -14,10 +13,9 @@ export const partition = (value) => {
         }
     }
     for (const partition of partitions) {
-        const { id, regionRegex, outputs } = partition;
+        const { regionRegex, outputs } = partition;
         if (new RegExp(regionRegex).test(value)) {
             return {
-                name: id,
                 ...outputs,
             };
         }
@@ -27,7 +25,6 @@ export const partition = (value) => {
             " and default partition with id 'aws' doesn't exist.");
     }
     return {
-        name: DEFAULT_PARTITION.id,
         ...DEFAULT_PARTITION.outputs,
     };
 };

package/dist-es/lib/aws/partitions.json

@@ -30,6 +30,7 @@
                 "aws-global": {}
             },
             "outputs": {
+                "name": "aws",
                 "dnsSuffix": "amazonaws.com",
                 "dualStackDnsSuffix": "api.aws",
                 "supportsFIPS": true,
@@ -45,6 +46,7 @@
                 "aws-us-gov-global": {}
             },
             "outputs": {
+                "name": "aws-us-gov",
                 "dnsSuffix": "amazonaws.com",
                 "dualStackDnsSuffix": "api.aws",
                 "supportsFIPS": true,
@@ -60,6 +62,7 @@
                 "aws-cn-global": {}
             },
             "outputs": {
+                "name": "aws-cn",
                 "dnsSuffix": "amazonaws.com.cn",
                 "dualStackDnsSuffix": "api.amazonwebservices.com.cn",
                 "supportsFIPS": true,
@@ -70,23 +73,29 @@
             "id": "aws-iso",
             "regionRegex": "^us\\-iso\\-\\w+\\-\\d+$",
             "outputs": {
+                "name": "aws-iso",
                 "dnsSuffix": "c2s.ic.gov",
                 "supportsFIPS": true,
                 "supportsDualStack": false,
                 "dualStackDnsSuffix": "c2s.ic.gov"
             },
-            "regions": {}
+            "regions": {
+                "aws-iso-global": {}
+            }
         },
         {
             "id": "aws-iso-b",
             "regionRegex": "^us\\-isob\\-\\w+\\-\\d+$",
             "outputs": {
+                "name": "aws-iso-b",
                 "dnsSuffix": "sc2s.sgov.gov",
                 "supportsFIPS": true,
                 "supportsDualStack": false,
                 "dualStackDnsSuffix": "sc2s.sgov.gov"
             },
-            "regions": {}
+            "regions": {
+                "aws-iso-b-global": {}
+            }
         }
     ]
 }

package/dist-es/lib/parseURL.js

@@ -7,6 +7,17 @@ const DEFAULT_PORTS = {
 export const parseURL = (value) => {
     const whatwgURL = (() => {
         try {
+            if (value instanceof URL) {
+                return value;
+            }
+            if (typeof value === "object" && "hostname" in value) {
+                const { hostname, port, protocol = "", path = "", query = {} } = value;
+                const url = new URL(`${protocol}//${hostname}${port ? `:${port}` : ""}${path}`);
+                url.search = Object.entries(query)
+                    .map(([k, v]) => `${k}=${v}`)
+                    .join("&");
+                return url;
+            }
             return new URL(value);
         }
         catch (error) {
@@ -14,8 +25,10 @@ export const parseURL = (value) => {
         }
     })();
     if (!whatwgURL) {
+        console.error(`Unable to parse ${JSON.stringify(value)} as a whatwg URL.`);
         return null;
     }
+    const urlString = whatwgURL.href;
     const { host, hostname, pathname, protocol, search } = whatwgURL;
     if (search) {
         return null;
@@ -25,7 +38,9 @@ export const parseURL = (value) => {
         return null;
     }
     const isIp = isIpAddress(hostname);
-    const authority = `${host}${value.includes(`${host}:${DEFAULT_PORTS[scheme]}`) ? `:${DEFAULT_PORTS[scheme]}` : ``}`;
+    const inputContainsDefaultPort = urlString.includes(`${host}:${DEFAULT_PORTS[scheme]}`) ||
+        (typeof value === "string" && value.includes(`${host}:${DEFAULT_PORTS[scheme]}`));
+    const authority = `${host}${inputContainsDefaultPort ? `:${DEFAULT_PORTS[scheme]}` : ``}`;
     return {
         scheme,
         authority,

package/dist-types/index.d.ts

@@ -1,2 +1,3 @@
+export * from "./lib/aws/partition";
 export * from "./resolveEndpoint";
 export * from "./types";

package/dist-types/lib/parseURL.d.ts

@@ -1,5 +1,5 @@
-import { EndpointURL } from "@aws-sdk/types";
+import { Endpoint, EndpointURL } from "@aws-sdk/types";
 /**
- * Parses a string into it’s Endpoint URL components.
+ * Parses a string, URL, or Endpoint into it’s Endpoint URL components.
  */
-export declare const parseURL: (value: string) => EndpointURL | null;
+export declare const parseURL: (value: string | URL | Endpoint) => EndpointURL | null;

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

@@ -1,2 +1,3 @@
+export * from "./lib/aws/partition";
 export * from "./resolveEndpoint";
 export * from "./types";

package/dist-types/ts3.4/lib/parseURL.d.ts

@@ -1,2 +1,4 @@
-import { EndpointURL } from "@aws-sdk/types";
-export declare const parseURL: (value: string) => EndpointURL | null;
+import { Endpoint, EndpointURL } from "@aws-sdk/types";
+export declare const parseURL: (
+  value: string | URL | Endpoint
+) => EndpointURL | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/util-endpoints",
-  "version": "3.188.0",
+  "version": "3.192.0",
   "description": "Utilities to help with endpoint resolution",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -21,7 +21,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/types": "3.188.0",
+    "@aws-sdk/types": "3.190.0",
     "tslib": "^2.3.1"
   },
   "engines": {