@aws-sdk/middleware-sdk-s3 3.972.36 → 3.972.38

package/dist-cjs/index.js

@@ -1,26 +1,26 @@
 'use strict';
 
-var protocolHttp = require('@smithy/protocol-http');
-var smithyClient = require('@smithy/smithy-client');
+var client = require('@smithy/core/client');
+var protocols = require('@smithy/core/protocols');
+var serde = require('@smithy/core/serde');
 var toStream = require('./toStream');
-var utilArnParser = require('@aws-sdk/util-arn-parser');
-var protocols = require('@aws-sdk/core/protocols');
+var util = require('@aws-sdk/core/util');
+var protocols$1 = require('@aws-sdk/core/protocols');
 var schema = require('@smithy/core/schema');
-var signatureV4 = require('@smithy/signature-v4');
-var utilConfigProvider = require('@smithy/util-config-provider');
-var client = require('@aws-sdk/core/client');
+var signatureV4MultiRegion = require('@aws-sdk/signature-v4-multi-region');
+var config = require('@smithy/core/config');
+var client$1 = require('@aws-sdk/core/client');
 var core = require('@smithy/core');
-var utilMiddleware = require('@smithy/util-middleware');
 
 const CONTENT_LENGTH_HEADER = "content-length";
 const DECODED_CONTENT_LENGTH_HEADER = "x-amz-decoded-content-length";
 function checkContentLengthHeader() {
     return (next, context) => async (args) => {
         const { request } = args;
-        if (protocolHttp.HttpRequest.isInstance(request)) {
+        if (protocols.HttpRequest.isInstance(request)) {
             if (!(CONTENT_LENGTH_HEADER in request.headers) && !(DECODED_CONTENT_LENGTH_HEADER in request.headers)) {
                 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 instanceof smithyClient.NoOpLogger)) {
+                if (typeof context?.logger?.warn === "function" && !(context.logger instanceof client.NoOpLogger)) {
                     context.logger.warn(message);
                 }
                 else {
@@ -131,11 +131,11 @@ const s3ExpiresMiddleware = (config) => {
     return (next, context) => async (args) => {
         const result = await next(args);
         const { response } = result;
-        if (protocolHttp.HttpResponse.isInstance(response)) {
+        if (protocols.HttpResponse.isInstance(response)) {
             if (response.headers.expires) {
                 response.headers.expiresstring = response.headers.expires;
                 try {
-                    smithyClient.parseRfc7231DateTime(response.headers.expires);
+                    serde.parseRfc7231DateTime(response.headers.expires);
                 }
                 catch (e) {
                     context.logger?.warn(`AWS SDK Warning for ${context.clientName}::${context.commandName} response parsing (${response.headers.expires}): ${e}`);
@@ -262,6 +262,9 @@ class S3ExpressIdentityProviderImpl {
     }
 }
 
+class SignatureV4S3Express extends signatureV4MultiRegion.SignatureV4SignWithCredentials {
+}
+
 const S3_EXPRESS_BUCKET_TYPE = "Directory";
 const S3_EXPRESS_BACKEND = "S3Express";
 const S3_EXPRESS_AUTH_SCHEME = "sigv4-s3express";
@@ -270,51 +273,11 @@ const SESSION_TOKEN_HEADER = SESSION_TOKEN_QUERY_PARAM.toLowerCase();
 const NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_ENV_NAME = "AWS_S3_DISABLE_EXPRESS_SESSION_AUTH";
 const NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_INI_NAME = "s3_disable_express_session_auth";
 const NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_OPTIONS = {
-    environmentVariableSelector: (env) => utilConfigProvider.booleanSelector(env, NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_ENV_NAME, utilConfigProvider.SelectorType.ENV),
-    configFileSelector: (profile) => utilConfigProvider.booleanSelector(profile, NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_INI_NAME, utilConfigProvider.SelectorType.CONFIG),
+    environmentVariableSelector: (env) => config.booleanSelector(env, NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_ENV_NAME, config.SelectorType.ENV),
+    configFileSelector: (profile) => config.booleanSelector(profile, NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_INI_NAME, config.SelectorType.CONFIG),
     default: false,
 };
 
-class SignatureV4S3Express extends signatureV4.SignatureV4 {
-    async signWithCredentials(requestToSign, credentials, options) {
-        const credentialsWithoutSessionToken = getCredentialsWithoutSessionToken(credentials);
-        requestToSign.headers[SESSION_TOKEN_HEADER] = credentials.sessionToken;
-        const privateAccess = this;
-        setSingleOverride(privateAccess, credentialsWithoutSessionToken);
-        return privateAccess.signRequest(requestToSign, options ?? {});
-    }
-    async presignWithCredentials(requestToSign, credentials, options) {
-        const credentialsWithoutSessionToken = getCredentialsWithoutSessionToken(credentials);
-        delete requestToSign.headers[SESSION_TOKEN_HEADER];
-        requestToSign.headers[SESSION_TOKEN_QUERY_PARAM] = credentials.sessionToken;
-        requestToSign.query = requestToSign.query ?? {};
-        requestToSign.query[SESSION_TOKEN_QUERY_PARAM] = credentials.sessionToken;
-        const privateAccess = this;
-        setSingleOverride(privateAccess, credentialsWithoutSessionToken);
-        return this.presign(requestToSign, options);
-    }
-}
-function getCredentialsWithoutSessionToken(credentials) {
-    const credentialsWithoutSessionToken = {
-        accessKeyId: credentials.accessKeyId,
-        secretAccessKey: credentials.secretAccessKey,
-        expiration: credentials.expiration,
-    };
-    return credentialsWithoutSessionToken;
-}
-function setSingleOverride(privateAccess, credentialsWithoutSessionToken) {
-    const id = setTimeout(() => {
-        throw new Error("SignatureV4S3Express credential override was created but not called.");
-    }, 10);
-    const currentCredentialProvider = privateAccess.credentialProvider;
-    const overrideCredentialsProviderOnce = () => {
-        clearTimeout(id);
-        privateAccess.credentialProvider = currentCredentialProvider;
-        return Promise.resolve(credentialsWithoutSessionToken);
-    };
-    privateAccess.credentialProvider = overrideCredentialsProviderOnce;
-}
-
 const s3ExpressMiddleware = (options) => {
     return (next, context) => async (args) => {
         if (context.endpointV2) {
@@ -323,7 +286,7 @@ const s3ExpressMiddleware = (options) => {
             const isS3ExpressBucket = endpoint.properties?.backend === S3_EXPRESS_BACKEND ||
                 endpoint.properties?.bucketType === S3_EXPRESS_BUCKET_TYPE;
             if (isS3ExpressBucket) {
-                client.setFeature(context, "S3_EXPRESS_BUCKET", "J");
+                client$1.setFeature(context, "S3_EXPRESS_BUCKET", "J");
                 context.isS3ExpressBucket = true;
             }
             if (isS3ExpressAuth) {
@@ -333,7 +296,7 @@ const s3ExpressMiddleware = (options) => {
                         Bucket: requestBucket,
                     });
                     context.s3ExpressIdentity = s3ExpressIdentity;
-                    if (protocolHttp.HttpRequest.isInstance(args.request) && s3ExpressIdentity.sessionToken) {
+                    if (protocols.HttpRequest.isInstance(args.request) && s3ExpressIdentity.sessionToken) {
                         args.request.headers[SESSION_TOKEN_HEADER] = s3ExpressIdentity.sessionToken;
                     }
                 }
@@ -368,10 +331,10 @@ const defaultErrorHandler = (signingProperties) => (error) => {
 const defaultSuccessHandler = (httpResponse, signingProperties) => { };
 const s3ExpressHttpSigningMiddlewareOptions = core.httpSigningMiddlewareOptions;
 const s3ExpressHttpSigningMiddleware = (config) => (next, context) => async (args) => {
-    if (!protocolHttp.HttpRequest.isInstance(args.request)) {
+    if (!protocols.HttpRequest.isInstance(args.request)) {
         return next(args);
     }
-    const smithyContext = utilMiddleware.getSmithyContext(context);
+    const smithyContext = client.getSmithyContext(context);
     const scheme = smithyContext.selectedHttpAuthScheme;
     if (!scheme) {
         throw new Error(`No HttpAuthScheme was selected: unable to sign request`);
@@ -422,7 +385,7 @@ const THROW_IF_EMPTY_BODY = {
 const throw200ExceptionsMiddleware = (config) => (next, context) => async (args) => {
     const result = await next(args);
     const { response } = result;
-    if (!protocolHttp.HttpResponse.isInstance(response)) {
+    if (!protocols.HttpResponse.isInstance(response)) {
         return result;
     }
     const { statusCode, body } = response;
@@ -504,7 +467,7 @@ const bucketEndpointMiddlewareOptions = {
 function validateBucketNameMiddleware({ bucketEndpoint }) {
     return (next) => async (args) => {
         const { input: { Bucket }, } = args;
-        if (!bucketEndpoint && typeof Bucket === "string" && !utilArnParser.validate(Bucket) && Bucket.indexOf("/") >= 0) {
+        if (!bucketEndpoint && typeof Bucket === "string" && !util.validate(Bucket) && Bucket.indexOf("/") >= 0) {
             const err = new Error(`Bucket name shouldn't contain '/', received '${Bucket}'`);
             err.name = "InvalidBucketName";
             throw err;
@@ -525,7 +488,7 @@ const getValidateBucketNamePlugin = (options) => ({
     },
 });
 
-class S3RestXmlProtocol extends protocols.AwsRestXmlProtocol {
+class S3RestXmlProtocol extends protocols$1.AwsRestXmlProtocol {
     async serializeRequest(operationSchema, input, context) {
         const request = await super.serializeRequest(operationSchema, input, context);
         const ns = schema.NormalizedSchema.of(operationSchema.input);

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

@@ -1,5 +1,5 @@
-import { HttpRequest } from "@smithy/protocol-http";
-import { NoOpLogger } from "@smithy/smithy-client";
+import { NoOpLogger } from "@smithy/core/client";
+import { HttpRequest } from "@smithy/core/protocols";
 const CONTENT_LENGTH_HEADER = "content-length";
 const DECODED_CONTENT_LENGTH_HEADER = "x-amz-decoded-content-length";
 export function checkContentLengthHeader() {

package/dist-es/s3-expires-middleware.js

@@ -1,5 +1,5 @@
-import { HttpResponse } from "@smithy/protocol-http";
-import { parseRfc7231DateTime } from "@smithy/smithy-client";
+import { HttpResponse } from "@smithy/core/protocols";
+import { parseRfc7231DateTime } from "@smithy/core/serde";
 export const s3ExpiresMiddleware = (config) => {
     return (next, context) => async (args) => {
         const result = await next(args);

package/dist-es/s3-express/classes/SignatureV4S3Express.js

@@ -1,41 +1,3 @@
-import { SignatureV4 } from "@smithy/signature-v4";
-import { SESSION_TOKEN_HEADER, SESSION_TOKEN_QUERY_PARAM } from "../constants";
-export class SignatureV4S3Express extends SignatureV4 {
-    async signWithCredentials(requestToSign, credentials, options) {
-        const credentialsWithoutSessionToken = getCredentialsWithoutSessionToken(credentials);
-        requestToSign.headers[SESSION_TOKEN_HEADER] = credentials.sessionToken;
-        const privateAccess = this;
-        setSingleOverride(privateAccess, credentialsWithoutSessionToken);
-        return privateAccess.signRequest(requestToSign, options ?? {});
-    }
-    async presignWithCredentials(requestToSign, credentials, options) {
-        const credentialsWithoutSessionToken = getCredentialsWithoutSessionToken(credentials);
-        delete requestToSign.headers[SESSION_TOKEN_HEADER];
-        requestToSign.headers[SESSION_TOKEN_QUERY_PARAM] = credentials.sessionToken;
-        requestToSign.query = requestToSign.query ?? {};
-        requestToSign.query[SESSION_TOKEN_QUERY_PARAM] = credentials.sessionToken;
-        const privateAccess = this;
-        setSingleOverride(privateAccess, credentialsWithoutSessionToken);
-        return this.presign(requestToSign, options);
-    }
-}
-function getCredentialsWithoutSessionToken(credentials) {
-    const credentialsWithoutSessionToken = {
-        accessKeyId: credentials.accessKeyId,
-        secretAccessKey: credentials.secretAccessKey,
-        expiration: credentials.expiration,
-    };
-    return credentialsWithoutSessionToken;
-}
-function setSingleOverride(privateAccess, credentialsWithoutSessionToken) {
-    const id = setTimeout(() => {
-        throw new Error("SignatureV4S3Express credential override was created but not called.");
-    }, 10);
-    const currentCredentialProvider = privateAccess.credentialProvider;
-    const overrideCredentialsProviderOnce = () => {
-        clearTimeout(id);
-        privateAccess.credentialProvider = currentCredentialProvider;
-        return Promise.resolve(credentialsWithoutSessionToken);
-    };
-    privateAccess.credentialProvider = overrideCredentialsProviderOnce;
+import { SignatureV4SignWithCredentials } from "@aws-sdk/signature-v4-multi-region";
+export class SignatureV4S3Express extends SignatureV4SignWithCredentials {
 }

package/dist-es/s3-express/constants.js

@@ -1,4 +1,4 @@
-import { booleanSelector, SelectorType } from "@smithy/util-config-provider";
+import { booleanSelector, SelectorType } from "@smithy/core/config";
 export const S3_EXPRESS_BUCKET_TYPE = "Directory";
 export const S3_EXPRESS_BACKEND = "S3Express";
 export const S3_EXPRESS_AUTH_SCHEME = "sigv4-s3express";

package/dist-es/s3-express/functions/s3ExpressHttpSigningMiddleware.js

@@ -1,6 +1,6 @@
 import { httpSigningMiddlewareOptions } from "@smithy/core";
-import { HttpRequest } from "@smithy/protocol-http";
-import { getSmithyContext } from "@smithy/util-middleware";
+import { getSmithyContext } from "@smithy/core/client";
+import { HttpRequest } from "@smithy/core/protocols";
 import { signS3Express } from "./signS3Express";
 const defaultErrorHandler = (signingProperties) => (error) => {
     throw error;

package/dist-es/s3-express/functions/s3ExpressMiddleware.js

@@ -1,5 +1,5 @@
 import { setFeature } from "@aws-sdk/core/client";
-import { HttpRequest } from "@smithy/protocol-http";
+import { HttpRequest } from "@smithy/core/protocols";
 import { S3_EXPRESS_AUTH_SCHEME, S3_EXPRESS_BACKEND, S3_EXPRESS_BUCKET_TYPE, SESSION_TOKEN_HEADER } from "../constants";
 export const s3ExpressMiddleware = (options) => {
     return (next, context) => async (args) => {

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

@@ -1,4 +1,4 @@
-import { HttpResponse } from "@smithy/protocol-http";
+import { HttpResponse } from "@smithy/core/protocols";
 import { toStream } from "./toStream";
 const THROW_IF_EMPTY_BODY = {
     CopyObjectCommand: true,

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

@@ -1,4 +1,4 @@
-import { validate as validateArn } from "@aws-sdk/util-arn-parser";
+import { validate as validateArn } from "@aws-sdk/core/util";
 import { bucketEndpointMiddleware, bucketEndpointMiddlewareOptions } from "./bucket-endpoint-middleware";
 export function validateBucketNameMiddleware({ bucketEndpoint }) {
     return (next) => async (args) => {

package/dist-types/s3-express/classes/SignatureV4S3Express.d.ts

@@ -1,17 +1,6 @@
-import type { AwsCredentialIdentity } from "@aws-sdk/types";
-import { SignatureV4 } from "@smithy/signature-v4";
-import type { HttpRequest as IHttpRequest, RequestPresigningArguments, RequestSigningArguments } from "@smithy/types";
-export declare class SignatureV4S3Express extends SignatureV4 {
-    /**
-     * Signs with alternate provided credentials instead of those provided in the
-     * constructor.
-     *
-     * Additionally omits the credential sessionToken and assigns it to the
-     * alternate header field for S3 Express.
-     */
-    signWithCredentials(requestToSign: IHttpRequest, credentials: AwsCredentialIdentity, options?: RequestSigningArguments): Promise<IHttpRequest>;
-    /**
-     * Similar to {@link SignatureV4S3Express#signWithCredentials} but for presigning.
-     */
-    presignWithCredentials(requestToSign: IHttpRequest, credentials: AwsCredentialIdentity, options?: RequestPresigningArguments): Promise<IHttpRequest>;
+import { SignatureV4SignWithCredentials } from "@aws-sdk/signature-v4-multi-region";
+/**
+ * @internal
+ */
+export declare class SignatureV4S3Express extends SignatureV4SignWithCredentials {
 }

package/dist-types/s3-express/constants.d.ts

@@ -1,4 +1,4 @@
-import type { LoadedConfigSelectors } from "@smithy/node-config-provider";
+import type { LoadedConfigSelectors } from "@smithy/core/config";
 /**
  * @internal
  *

package/dist-types/s3-express/functions/s3ExpressHttpSigningMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { IHttpRequest } from "@smithy/protocol-http";
+import type { IHttpRequest } from "@smithy/core/protocols";
 import type { AuthScheme, AwsCredentialIdentity, FinalizeRequestMiddleware, Pluggable, RequestSigner } from "@smithy/types";
 interface SigningProperties {
     signingRegion: string;

package/dist-types/ts3.4/s3-express/classes/SignatureV4S3Express.d.ts

@@ -1,19 +1,2 @@
-import { AwsCredentialIdentity } from "@aws-sdk/types";
-import { SignatureV4 } from "@smithy/signature-v4";
-import {
-  HttpRequest as IHttpRequest,
-  RequestPresigningArguments,
-  RequestSigningArguments,
-} from "@smithy/types";
-export declare class SignatureV4S3Express extends SignatureV4 {
-  signWithCredentials(
-    requestToSign: IHttpRequest,
-    credentials: AwsCredentialIdentity,
-    options?: RequestSigningArguments
-  ): Promise<IHttpRequest>;
-  presignWithCredentials(
-    requestToSign: IHttpRequest,
-    credentials: AwsCredentialIdentity,
-    options?: RequestPresigningArguments
-  ): Promise<IHttpRequest>;
-}
+import { SignatureV4SignWithCredentials } from "@aws-sdk/signature-v4-multi-region";
+export declare class SignatureV4S3Express extends SignatureV4SignWithCredentials {}

package/dist-types/ts3.4/s3-express/constants.d.ts

@@ -1,4 +1,4 @@
-import { LoadedConfigSelectors } from "@smithy/node-config-provider";
+import { LoadedConfigSelectors } from "@smithy/core/config";
 export declare const S3_EXPRESS_BUCKET_TYPE = "Directory";
 export declare const S3_EXPRESS_BACKEND = "S3Express";
 export declare const S3_EXPRESS_AUTH_SCHEME = "sigv4-s3express";

package/dist-types/ts3.4/s3-express/functions/s3ExpressHttpSigningMiddleware.d.ts

@@ -1,4 +1,4 @@
-import { IHttpRequest } from "@smithy/protocol-http";
+import { IHttpRequest } from "@smithy/core/protocols";
 import {
   AuthScheme,
   AwsCredentialIdentity,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-sdk-s3",
-  "version": "3.972.36",
+  "version": "3.972.38",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline middleware-sdk-s3",
@@ -28,19 +28,12 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/core": "^3.974.7",
+    "@aws-sdk/core": "^3.974.9",
+    "@aws-sdk/signature-v4-multi-region": "^3.996.26",
     "@aws-sdk/types": "^3.973.8",
-    "@aws-sdk/util-arn-parser": "^3.972.3",
-    "@smithy/core": "^3.23.17",
-    "@smithy/node-config-provider": "^4.3.14",
-    "@smithy/protocol-http": "^5.3.14",
-    "@smithy/signature-v4": "^5.3.14",
-    "@smithy/smithy-client": "^4.12.13",
+    "@smithy/core": "^3.24.1",
+    "@smithy/signature-v4": "^5.4.1",
     "@smithy/types": "^4.14.1",
-    "@smithy/util-config-provider": "^4.2.2",
-    "@smithy/util-middleware": "^4.2.14",
-    "@smithy/util-stream": "^4.5.25",
-    "@smithy/util-utf8": "^4.2.2",
     "tslib": "^2.6.2"
   },
   "devDependencies": {