@aws-sdk/middleware-sdk-s3 3.171.0 → 3.183.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.183.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.182.0...v3.183.0) (2022-10-03)
+
+**Note:** Version bump only for package @aws-sdk/middleware-sdk-s3
+
+
+
+
+
+# [3.178.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.177.0...v3.178.0) (2022-09-23)
+
+
+### Features
+
+* **endpoint:** endpoints 2.0 existing package changes ([#3947](https://github.com/aws/aws-sdk-js-v3/issues/3947)) ([df99fc3](https://github.com/aws/aws-sdk-js-v3/commit/df99fc33a43982e1c59000721a535f6fe77a3c23))
+
+
+
+
+
 # [3.171.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.170.0...v3.171.0) (2022-09-14)
 
 **Note:** Version bump only for package @aws-sdk/middleware-sdk-s3

package/dist-cjs/configuration.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveS3Config = void 0;
+const resolveS3Config = (input) => {
+    var _a, _b, _c;
+    return ({
+        ...input,
+        forcePathStyle: (_a = input.forcePathStyle) !== null && _a !== void 0 ? _a : false,
+        useAccelerateEndpoint: (_b = input.useAccelerateEndpoint) !== null && _b !== void 0 ? _b : false,
+        disableMultiregionAccessPoints: (_c = input.disableMultiregionAccessPoints) !== null && _c !== void 0 ? _c : false,
+    });
+};
+exports.resolveS3Config = resolveS3Config;

package/dist-cjs/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./check-content-length-header"), exports);
+tslib_1.__exportStar(require("./configuration"), exports);
 tslib_1.__exportStar(require("./throw-200-exceptions"), exports);
 tslib_1.__exportStar(require("./validate-bucket-name"), exports);
 tslib_1.__exportStar(require("./write-get-object-response-endpoint"), exports);

package/dist-es/check-content-length-header.js

@@ -1,38 +1,30 @@
-import { __assign, __awaiter, __generator } from "tslib";
 import { HttpRequest } from "@aws-sdk/protocol-http";
-var CONTENT_LENGTH_HEADER = "content-length";
+const CONTENT_LENGTH_HEADER = "content-length";
 export function checkContentLengthHeader() {
-    var _this = this;
-    return function (next, context) {
-        return function (args) { return __awaiter(_this, void 0, void 0, function () {
-            var request, message;
-            var _a;
-            return __generator(this, function (_b) {
-                request = args.request;
-                if (HttpRequest.isInstance(request)) {
-                    if (!request.headers[CONTENT_LENGTH_HEADER]) {
-                        message = "Are you using a Stream of unknown length as the Body of a PutObject request? Consider using Upload instead from @aws-sdk/lib-storage.";
-                        if (typeof ((_a = context === null || context === void 0 ? void 0 : context.logger) === null || _a === void 0 ? void 0 : _a.warn) === "function") {
-                            context.logger.warn(message);
-                        }
-                        else {
-                            console.warn(message);
-                        }
-                    }
+    return (next, context) => async (args) => {
+        const { request } = args;
+        if (HttpRequest.isInstance(request)) {
+            if (!request.headers[CONTENT_LENGTH_HEADER]) {
+                const message = `Are you using a Stream of unknown length as the Body of a PutObject request? Consider using Upload instead from @aws-sdk/lib-storage.`;
+                if (typeof context?.logger?.warn === "function") {
+                    context.logger.warn(message);
                 }
-                return [2, next(__assign({}, args))];
-            });
-        }); };
+                else {
+                    console.warn(message);
+                }
+            }
+        }
+        return next({ ...args });
     };
 }
-export var checkContentLengthHeaderMiddlewareOptions = {
+export const checkContentLengthHeaderMiddlewareOptions = {
     step: "finalizeRequest",
     tags: ["CHECK_CONTENT_LENGTH_HEADER"],
     name: "getCheckContentLengthHeaderPlugin",
     override: true,
 };
-export var getCheckContentLengthHeaderPlugin = function (unused) { return ({
-    applyToStack: function (clientStack) {
+export const getCheckContentLengthHeaderPlugin = (unused) => ({
+    applyToStack: (clientStack) => {
         clientStack.add(checkContentLengthHeader(), checkContentLengthHeaderMiddlewareOptions);
     },
-}); };
+});

package/dist-es/configuration.js

@@ -0,0 +1,6 @@
+export const resolveS3Config = (input) => ({
+    ...input,
+    forcePathStyle: input.forcePathStyle ?? false,
+    useAccelerateEndpoint: input.useAccelerateEndpoint ?? false,
+    disableMultiregionAccessPoints: input.disableMultiregionAccessPoints ?? false,
+});

package/dist-es/index.js

@@ -1,4 +1,5 @@
 export * from "./check-content-length-header";
+export * from "./configuration";
 export * from "./throw-200-exceptions";
 export * from "./validate-bucket-name";
 export * from "./write-get-object-response-endpoint";

package/dist-es/throw-200-exceptions.js

@@ -1,60 +1,41 @@
-import { __awaiter, __generator } from "tslib";
 import { HttpResponse } from "@aws-sdk/protocol-http";
-export var throw200ExceptionsMiddleware = function (config) {
-    return function (next) {
-        return function (args) { return __awaiter(void 0, void 0, void 0, function () {
-            var result, response, statusCode, body, bodyBytes, bodyString, err;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, next(args)];
-                    case 1:
-                        result = _a.sent();
-                        response = result.response;
-                        if (!HttpResponse.isInstance(response))
-                            return [2, result];
-                        statusCode = response.statusCode, body = response.body;
-                        if (statusCode < 200 || statusCode >= 300)
-                            return [2, result];
-                        return [4, collectBody(body, config)];
-                    case 2:
-                        bodyBytes = _a.sent();
-                        return [4, collectBodyString(bodyBytes, config)];
-                    case 3:
-                        bodyString = _a.sent();
-                        if (bodyBytes.length === 0) {
-                            err = new Error("S3 aborted request");
-                            err.name = "InternalError";
-                            throw err;
-                        }
-                        if (bodyString && bodyString.match("<Error>")) {
-                            response.statusCode = 400;
-                        }
-                        response.body = bodyBytes;
-                        return [2, result];
-                }
-            });
-        }); };
-    };
+export const throw200ExceptionsMiddleware = (config) => (next) => async (args) => {
+    const result = await next(args);
+    const { response } = result;
+    if (!HttpResponse.isInstance(response))
+        return result;
+    const { statusCode, body } = response;
+    if (statusCode < 200 || statusCode >= 300)
+        return result;
+    const bodyBytes = await collectBody(body, config);
+    const bodyString = await collectBodyString(bodyBytes, config);
+    if (bodyBytes.length === 0) {
+        const err = new Error("S3 aborted request");
+        err.name = "InternalError";
+        throw err;
+    }
+    if (bodyString && bodyString.match("<Error>")) {
+        response.statusCode = 400;
+    }
+    response.body = bodyBytes;
+    return result;
 };
-var collectBody = function (streamBody, context) {
-    if (streamBody === void 0) { streamBody = new Uint8Array(); }
+const collectBody = (streamBody = new Uint8Array(), context) => {
     if (streamBody instanceof Uint8Array) {
         return Promise.resolve(streamBody);
     }
     return context.streamCollector(streamBody) || Promise.resolve(new Uint8Array());
 };
-var collectBodyString = function (streamBody, context) {
-    return collectBody(streamBody, context).then(function (body) { return context.utf8Encoder(body); });
-};
-export var throw200ExceptionsMiddlewareOptions = {
+const collectBodyString = (streamBody, context) => collectBody(streamBody, context).then((body) => context.utf8Encoder(body));
+export const throw200ExceptionsMiddlewareOptions = {
     relation: "after",
     toMiddleware: "deserializerMiddleware",
     tags: ["THROW_200_EXCEPTIONS", "S3"],
     name: "throw200ExceptionsMiddleware",
     override: true,
 };
-export var getThrow200ExceptionsPlugin = function (config) { return ({
-    applyToStack: function (clientStack) {
+export const getThrow200ExceptionsPlugin = (config) => ({
+    applyToStack: (clientStack) => {
         clientStack.addRelativeTo(throw200ExceptionsMiddleware(config), throw200ExceptionsMiddlewareOptions);
     },
-}); };
+});

package/dist-es/validate-bucket-name.js

@@ -1,30 +1,23 @@
-import { __assign, __awaiter, __generator } from "tslib";
 import { validate as validateArn } from "@aws-sdk/util-arn-parser";
 export function validateBucketNameMiddleware() {
-    var _this = this;
-    return function (next) {
-        return function (args) { return __awaiter(_this, void 0, void 0, function () {
-            var Bucket, err;
-            return __generator(this, function (_a) {
-                Bucket = args.input.Bucket;
-                if (typeof Bucket === "string" && !validateArn(Bucket) && Bucket.indexOf("/") >= 0) {
-                    err = new Error("Bucket name shouldn't contain '/', received '".concat(Bucket, "'"));
-                    err.name = "InvalidBucketName";
-                    throw err;
-                }
-                return [2, next(__assign({}, args))];
-            });
-        }); };
+    return (next) => async (args) => {
+        const { input: { Bucket }, } = args;
+        if (typeof Bucket === "string" && !validateArn(Bucket) && Bucket.indexOf("/") >= 0) {
+            const err = new Error(`Bucket name shouldn't contain '/', received '${Bucket}'`);
+            err.name = "InvalidBucketName";
+            throw err;
+        }
+        return next({ ...args });
     };
 }
-export var validateBucketNameMiddlewareOptions = {
+export const validateBucketNameMiddlewareOptions = {
     step: "initialize",
     tags: ["VALIDATE_BUCKET_NAME"],
     name: "validateBucketNameMiddleware",
     override: true,
 };
-export var getValidateBucketNamePlugin = function (unused) { return ({
-    applyToStack: function (clientStack) {
+export const getValidateBucketNamePlugin = (unused) => ({
+    applyToStack: (clientStack) => {
         clientStack.add(validateBucketNameMiddleware(), validateBucketNameMiddlewareOptions);
     },
-}); };
+});

package/dist-es/write-get-object-response-endpoint.js

@@ -1,51 +1,38 @@
-import { __assign, __awaiter, __generator, __read } from "tslib";
 import { getSuffixForArnEndpoint } from "@aws-sdk/middleware-bucket-endpoint";
 import { HttpRequest } from "@aws-sdk/protocol-http";
-export var writeGetObjectResponseEndpointMiddleware = function (config) {
-    return function (next, context) {
-        return function (args) { return __awaiter(void 0, void 0, void 0, function () {
-            var regionProvider, isCustomEndpoint, disableHostPrefix, region, request, input, hostname, _a, suffix;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        regionProvider = config.region, isCustomEndpoint = config.isCustomEndpoint, disableHostPrefix = config.disableHostPrefix;
-                        return [4, regionProvider()];
-                    case 1:
-                        region = _b.sent();
-                        request = args.request, input = args.input;
-                        if (!HttpRequest.isInstance(request))
-                            return [2, next(__assign({}, args))];
-                        hostname = request.hostname;
-                        if (hostname.endsWith("s3.amazonaws.com") || hostname.endsWith("s3-external-1.amazonaws.com")) {
-                            return [2, next(__assign({}, args))];
-                        }
-                        if (!isCustomEndpoint) {
-                            _a = __read(getSuffixForArnEndpoint(request.hostname), 2), suffix = _a[1];
-                            hostname = "s3-object-lambda.".concat(region, ".").concat(suffix);
-                        }
-                        if (!disableHostPrefix && input.RequestRoute) {
-                            hostname = "".concat(input.RequestRoute, ".").concat(hostname);
-                        }
-                        request.hostname = hostname;
-                        context["signing_service"] = "s3-object-lambda";
-                        if (config.runtime === "node" && !request.headers["content-length"]) {
-                            request.headers["transfer-encoding"] = "chunked";
-                        }
-                        return [2, next(__assign({}, args))];
-                }
-            });
-        }); };
-    };
+export const writeGetObjectResponseEndpointMiddleware = (config) => (next, context) => async (args) => {
+    const { region: regionProvider, isCustomEndpoint, disableHostPrefix } = config;
+    const region = await regionProvider();
+    const { request, input } = args;
+    if (!HttpRequest.isInstance(request))
+        return next({ ...args });
+    let hostname = request.hostname;
+    if (hostname.endsWith("s3.amazonaws.com") || hostname.endsWith("s3-external-1.amazonaws.com")) {
+        return next({ ...args });
+    }
+    if (!isCustomEndpoint) {
+        const [, suffix] = getSuffixForArnEndpoint(request.hostname);
+        hostname = `s3-object-lambda.${region}.${suffix}`;
+    }
+    if (!disableHostPrefix && input.RequestRoute) {
+        hostname = `${input.RequestRoute}.${hostname}`;
+    }
+    request.hostname = hostname;
+    context["signing_service"] = "s3-object-lambda";
+    if (config.runtime === "node" && !request.headers["content-length"]) {
+        request.headers["transfer-encoding"] = "chunked";
+    }
+    return next({ ...args });
 };
-export var writeGetObjectResponseEndpointMiddlewareOptions = {
+export const writeGetObjectResponseEndpointMiddlewareOptions = {
     relation: "after",
     toMiddleware: "contentLengthMiddleware",
     tags: ["WRITE_GET_OBJECT_RESPONSE", "S3", "ENDPOINT"],
     name: "writeGetObjectResponseEndpointMiddleware",
     override: true,
 };
-export var getWriteGetObjectResponseEndpointPlugin = function (config) { return ({
-    applyToStack: function (clientStack) {
+export const getWriteGetObjectResponseEndpointPlugin = (config) => ({
+    applyToStack: (clientStack) => {
         clientStack.addRelativeTo(writeGetObjectResponseEndpointMiddleware(config), writeGetObjectResponseEndpointMiddlewareOptions);
     },
-}); };
+});

package/dist-types/configuration.d.ts

@@ -0,0 +1,24 @@
+/**
+ * All endpoint parameters with built-in bindings of AWS::S3::*
+ */
+export interface S3InputConfig {
+    /**
+     * 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;
+    /**
+     * Whether multi-region access points (MRAP) should be disabled.
+     */
+    disableMultiregionAccessPoints?: boolean;
+}
+export interface S3ResolvedConfig {
+    forcePathStyle: boolean;
+    useAccelerateEndpoint: boolean;
+    disableMultiregionAccessPoints: boolean;
+}
+export declare const resolveS3Config: <T>(input: T & S3InputConfig) => T & S3ResolvedConfig;

package/dist-types/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./check-content-length-header";
+export * from "./configuration";
 export * from "./throw-200-exceptions";
 export * from "./validate-bucket-name";
 export * from "./write-get-object-response-endpoint";

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

@@ -0,0 +1,13 @@
+export interface S3InputConfig {
+  forcePathStyle?: boolean;
+  useAccelerateEndpoint?: boolean;
+  disableMultiregionAccessPoints?: boolean;
+}
+export interface S3ResolvedConfig {
+  forcePathStyle: boolean;
+  useAccelerateEndpoint: boolean;
+  disableMultiregionAccessPoints: boolean;
+}
+export declare const resolveS3Config: <T>(
+  input: T & S3InputConfig
+) => T & S3ResolvedConfig;

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

@@ -1,4 +1,5 @@
 export * from "./check-content-length-header";
+export * from "./configuration";
 export * from "./throw-200-exceptions";
 export * from "./validate-bucket-name";
 export * from "./write-get-object-response-endpoint";

package/dist-types/ts3.4/write-get-object-response-endpoint.d.ts

@@ -6,7 +6,7 @@ import {
 } from "@aws-sdk/types";
 declare type PreviouslyResolved = {
   region: Provider<string>;
-  isCustomEndpoint: boolean;
+  isCustomEndpoint?: boolean;
   disableHostPrefix: boolean;
   runtime: string;
 };

package/dist-types/write-get-object-response-endpoint.d.ts

@@ -1,7 +1,7 @@
 import { BuildMiddleware, Pluggable, Provider, RelativeMiddlewareOptions } from "@aws-sdk/types";
 declare type PreviouslyResolved = {
     region: Provider<string>;
-    isCustomEndpoint: boolean;
+    isCustomEndpoint?: boolean;
     disableHostPrefix: boolean;
     runtime: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-sdk-s3",
-  "version": "3.171.0",
+  "version": "3.183.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "tsc -p tsconfig.cjs.json",
@@ -20,10 +20,10 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/middleware-bucket-endpoint": "3.171.0",
-    "@aws-sdk/protocol-http": "3.171.0",
-    "@aws-sdk/types": "3.171.0",
-    "@aws-sdk/util-arn-parser": "3.170.0",
+    "@aws-sdk/middleware-bucket-endpoint": "3.183.0",
+    "@aws-sdk/protocol-http": "3.183.0",
+    "@aws-sdk/types": "3.183.0",
+    "@aws-sdk/util-arn-parser": "3.183.0",
     "tslib": "^2.3.1"
   },
   "devDependencies": {