@aws-sdk/middleware-sdk-s3 3.972.24 → 3.972.26

package/dist-cjs/index.js

@@ -4,6 +4,8 @@ var protocolHttp = require('@smithy/protocol-http');
 var smithyClient = require('@smithy/smithy-client');
 var utilStream = require('@smithy/util-stream');
 var utilArnParser = require('@aws-sdk/util-arn-parser');
+var protocols = 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 core = require('@aws-sdk/core');
@@ -539,10 +541,35 @@ const getValidateBucketNamePlugin = (options) => ({
     },
 });
 
+class S3RestXmlProtocol extends protocols.AwsRestXmlProtocol {
+    async serializeRequest(operationSchema, input, context) {
+        const request = await super.serializeRequest(operationSchema, input, context);
+        const ns = schema.NormalizedSchema.of(operationSchema.input);
+        const staticStructureSchema = ns.getSchema();
+        let bucketMemberIndex = 0;
+        const requiredMemberCount = staticStructureSchema[6] ?? 0;
+        if (input && typeof input === "object") {
+            for (const [memberName, memberNs] of ns.structIterator()) {
+                if (++bucketMemberIndex > requiredMemberCount) {
+                    break;
+                }
+                if (memberName === "Bucket") {
+                    if (!input.Bucket && memberNs.getMergedTraits().httpLabel) {
+                        throw new Error(`No value provided for input HTTP label: Bucket.`);
+                    }
+                    break;
+                }
+            }
+        }
+        return request;
+    }
+}
+
 exports.NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_OPTIONS = NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_OPTIONS;
 exports.S3ExpressIdentityCache = S3ExpressIdentityCache;
 exports.S3ExpressIdentityCacheEntry = S3ExpressIdentityCacheEntry;
 exports.S3ExpressIdentityProviderImpl = S3ExpressIdentityProviderImpl;
+exports.S3RestXmlProtocol = S3RestXmlProtocol;
 exports.SignatureV4S3Express = SignatureV4S3Express;
 exports.checkContentLengthHeader = checkContentLengthHeader;
 exports.checkContentLengthHeaderMiddlewareOptions = checkContentLengthHeaderMiddlewareOptions;

package/dist-es/index.js

@@ -6,3 +6,4 @@ export * from "./s3-express/index";
 export * from "./s3Configuration";
 export * from "./throw-200-exceptions";
 export * from "./validate-bucket-name";
+export { S3RestXmlProtocol } from "./protocol/S3RestXmlProtocol";

package/dist-es/protocol/S3RestXmlProtocol.js

@@ -0,0 +1,25 @@
+import { AwsRestXmlProtocol } from "@aws-sdk/core/protocols";
+import { NormalizedSchema } from "@smithy/core/schema";
+export class S3RestXmlProtocol extends AwsRestXmlProtocol {
+    async serializeRequest(operationSchema, input, context) {
+        const request = await super.serializeRequest(operationSchema, input, context);
+        const ns = NormalizedSchema.of(operationSchema.input);
+        const staticStructureSchema = ns.getSchema();
+        let bucketMemberIndex = 0;
+        const requiredMemberCount = staticStructureSchema[6] ?? 0;
+        if (input && typeof input === "object") {
+            for (const [memberName, memberNs] of ns.structIterator()) {
+                if (++bucketMemberIndex > requiredMemberCount) {
+                    break;
+                }
+                if (memberName === "Bucket") {
+                    if (!input.Bucket && memberNs.getMergedTraits().httpLabel) {
+                        throw new Error(`No value provided for input HTTP label: Bucket.`);
+                    }
+                    break;
+                }
+            }
+        }
+        return request;
+    }
+}

package/dist-types/index.d.ts

@@ -6,3 +6,4 @@ export * from "./s3-express/index";
 export * from "./s3Configuration";
 export * from "./throw-200-exceptions";
 export * from "./validate-bucket-name";
+export { S3RestXmlProtocol } from "./protocol/S3RestXmlProtocol";

package/dist-types/protocol/S3RestXmlProtocol.d.ts

@@ -0,0 +1,20 @@
+import { AwsRestXmlProtocol } from "@aws-sdk/core/protocols";
+import type { EndpointBearer, HandlerExecutionContext, HttpRequest, OperationSchema, SerdeFunctions } from "@smithy/types";
+/**
+ * Customization for S3 backwards compatibility.
+ *
+ * In the S3 model, Bucket is considered an HTTP label, and we normally perform http label client
+ * side validation. However, the standard validation is that the http label appears in
+ * the request path. Bucket is unique in that it is an endpoint context param. It appears
+ * where the endpoint resolver decides, rather than in the URL path (although sometimes it does appear there).
+ *
+ * For consistency with older code generated clients, we throw the HTTP label validation
+ * error when the Bucket input is missing, if-and-only-if it is an httpLabel and is a required top level member.
+ *
+ * This does not apply to S3 Control.
+ *
+ * @internal
+ */
+export declare class S3RestXmlProtocol extends AwsRestXmlProtocol {
+    serializeRequest<Input extends object>(operationSchema: OperationSchema, input: Input, context: HandlerExecutionContext & SerdeFunctions & EndpointBearer): Promise<HttpRequest>;
+}

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

@@ -6,3 +6,4 @@ export * from "./s3-express/index";
 export * from "./s3Configuration";
 export * from "./throw-200-exceptions";
 export * from "./validate-bucket-name";
+export { S3RestXmlProtocol } from "./protocol/S3RestXmlProtocol";

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

@@ -0,0 +1,15 @@
+import { AwsRestXmlProtocol } from "@aws-sdk/core/protocols";
+import {
+  EndpointBearer,
+  HandlerExecutionContext,
+  HttpRequest,
+  OperationSchema,
+  SerdeFunctions,
+} from "@smithy/types";
+export declare class S3RestXmlProtocol extends AwsRestXmlProtocol {
+  serializeRequest<Input extends object>(
+    operationSchema: OperationSchema,
+    input: Input,
+    context: HandlerExecutionContext & SerdeFunctions & EndpointBearer
+  ): Promise<HttpRequest>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-sdk-s3",
-  "version": "3.972.24",
+  "version": "3.972.26",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline middleware-sdk-s3",
@@ -28,7 +28,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/core": "^3.973.24",
+    "@aws-sdk/core": "^3.973.25",
     "@aws-sdk/types": "^3.973.6",
     "@aws-sdk/util-arn-parser": "^3.972.3",
     "@smithy/core": "^3.23.12",