@aws-sdk/lib-storage 3.170.0 → 3.178.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.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)
+
+
+### Features
+
+* **endpoint:** endpoints v2 codegen ([#3942](https://github.com/aws/aws-sdk-js-v3/issues/3942)) ([4b32da4](https://github.com/aws/aws-sdk-js-v3/commit/4b32da42011194d4eefe32eb6f7035872fb163c2))
+
+
+
+
+
 # [3.170.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.169.0...v3.170.0) (2022-09-13)
 
 **Note:** Version bump only for package @aws-sdk/lib-storage

package/dist-cjs/Upload.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Upload = void 0;
 const abort_controller_1 = require("@aws-sdk/abort-controller");
 const client_s3_1 = require("@aws-sdk/client-s3");
+const middleware_endpoint_1 = require("@aws-sdk/middleware-endpoint");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
 const events_1 = require("events");
 const bytelength_1 = require("./bytelength");
@@ -41,9 +42,11 @@ class Upload extends events_1.EventEmitter {
         return super.on(event, listener);
     }
     async __uploadUsingPut(dataPart) {
+        var _a;
         this.isMultiPart = false;
         const params = { ...this.params, Body: dataPart.data };
-        const requestHandler = this.client.config.requestHandler;
+        const clientConfig = this.client.config;
+        const requestHandler = clientConfig.requestHandler;
         const eventEmitter = requestHandler instanceof events_1.EventEmitter ? requestHandler : null;
         const uploadEventListener = (event) => {
             this.bytesUploadedSoFar = event.loaded;
@@ -59,10 +62,17 @@ class Upload extends events_1.EventEmitter {
         if (eventEmitter !== null) {
             eventEmitter.on("xhr.upload.progress", uploadEventListener);
         }
-        const [putResult, endpoint] = await Promise.all([
-            this.client.send(new client_s3_1.PutObjectCommand(params)),
-            this.client.config.endpoint(),
-        ]);
+        const resolved = await Promise.all([this.client.send(new client_s3_1.PutObjectCommand(params)), (_a = clientConfig === null || clientConfig === void 0 ? void 0 : clientConfig.endpoint) === null || _a === void 0 ? void 0 : _a.call(clientConfig)]);
+        const putResult = resolved[0];
+        let endpoint = resolved[1];
+        if (!endpoint) {
+            endpoint = (0, middleware_endpoint_1.toEndpointV1)(await (0, middleware_endpoint_1.getEndpointFromInstructions)(params, client_s3_1.PutObjectCommand, {
+                ...clientConfig,
+            }));
+        }
+        if (!endpoint) {
+            throw new Error('Could not resolve endpoint from S3 "client.config.endpoint()" nor EndpointsV2.');
+        }
         if (eventEmitter !== null) {
             eventEmitter.off("xhr.upload.progress", uploadEventListener);
         }

package/dist-es/Upload.js

@@ -1,6 +1,7 @@
-import { __assign, __asyncValues, __awaiter, __extends, __generator, __read } from "tslib";
+import { __assign, __asyncValues, __awaiter, __extends, __generator } from "tslib";
 import { AbortController } from "@aws-sdk/abort-controller";
 import { CompleteMultipartUploadCommand, CreateMultipartUploadCommand, PutObjectCommand, PutObjectTaggingCommand, UploadPartCommand, } from "@aws-sdk/client-s3";
+import { getEndpointFromInstructions, toEndpointV1, } from "@aws-sdk/middleware-endpoint";
 import { extendedEncodeURIComponent } from "@aws-sdk/smithy-client";
 import { EventEmitter } from "events";
 import { byteLength } from "./bytelength";
@@ -53,15 +54,17 @@ var Upload = (function (_super) {
         return _super.prototype.on.call(this, event, listener);
     };
     Upload.prototype.__uploadUsingPut = function (dataPart) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var params, requestHandler, eventEmitter, uploadEventListener, _a, putResult, endpoint, locationKey, locationBucket, Location, totalSize;
+            var params, clientConfig, requestHandler, eventEmitter, uploadEventListener, resolved, putResult, endpoint, _b, locationKey, locationBucket, Location, totalSize;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         this.isMultiPart = false;
                         params = __assign(__assign({}, this.params), { Body: dataPart.data });
-                        requestHandler = this.client.config.requestHandler;
+                        clientConfig = this.client.config;
+                        requestHandler = clientConfig.requestHandler;
                         eventEmitter = requestHandler instanceof EventEmitter ? requestHandler : null;
                         uploadEventListener = function (event) {
                             _this.bytesUploadedSoFar = event.loaded;
@@ -77,12 +80,21 @@ var Upload = (function (_super) {
                         if (eventEmitter !== null) {
                             eventEmitter.on("xhr.upload.progress", uploadEventListener);
                         }
-                        return [4, Promise.all([
-                                this.client.send(new PutObjectCommand(params)),
-                                this.client.config.endpoint(),
-                            ])];
+                        return [4, Promise.all([this.client.send(new PutObjectCommand(params)), (_a = clientConfig === null || clientConfig === void 0 ? void 0 : clientConfig.endpoint) === null || _a === void 0 ? void 0 : _a.call(clientConfig)])];
                     case 1:
-                        _a = __read.apply(void 0, [_b.sent(), 2]), putResult = _a[0], endpoint = _a[1];
+                        resolved = _c.sent();
+                        putResult = resolved[0];
+                        endpoint = resolved[1];
+                        if (!!endpoint) return [3, 3];
+                        _b = toEndpointV1;
+                        return [4, getEndpointFromInstructions(params, PutObjectCommand, __assign({}, clientConfig))];
+                    case 2:
+                        endpoint = _b.apply(void 0, [_c.sent()]);
+                        _c.label = 3;
+                    case 3:
+                        if (!endpoint) {
+                            throw new Error('Could not resolve endpoint from S3 "client.config.endpoint()" nor EndpointsV2.');
+                        }
                         if (eventEmitter !== null) {
                             eventEmitter.off("xhr.upload.progress", uploadEventListener);
                         }

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

@@ -1,5 +1,4 @@
 import { lstatSync } from "fs";
-
 export declare const ClientDefaultValues: {
   runtime: string;
   lstatSync: typeof lstatSync;

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

@@ -7,19 +7,14 @@ export interface Progress {
   Bucket?: string;
 }
 export declare type BodyDataTypes = PutObjectCommandInput["Body"];
-
 export declare type ServiceClients = S3Client;
 export interface Configuration {
   queueSize: number;
-
   partSize: number;
-
   leavePartsOnError: boolean;
-
   tags: Tag[];
 }
 export interface Options extends Partial<Configuration> {
   params: PutObjectCommandInput;
-
   client: S3Client;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/lib-storage",
-  "version": "3.170.0",
+  "version": "3.178.0",
   "description": "Storage higher order operation",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -24,7 +24,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/smithy-client": "3.170.0",
+    "@aws-sdk/middleware-endpoint": "3.178.0",
+    "@aws-sdk/smithy-client": "3.178.0",
     "buffer": "5.6.0",
     "events": "3.3.0",
     "stream-browserify": "3.0.0",
@@ -35,8 +36,9 @@
     "@aws-sdk/client-s3": "^3.0.0"
   },
   "devDependencies": {
-    "@aws-sdk/abort-controller": "3.170.0",
-    "@aws-sdk/client-s3": "3.170.0",
+    "@aws-sdk/abort-controller": "3.178.0",
+    "@aws-sdk/client-s3": "3.178.0",
+    "@aws-sdk/types": "3.178.0",
     "@tsconfig/recommended": "1.0.1",
     "@types/node": "^14.11.2",
     "concurrently": "7.0.0",