@aws-sdk/middleware-sdk-s3-control 3.821.0 → 3.830.0

package/dist-cjs/index.js

@@ -40,7 +40,7 @@ module.exports = __toCommonJS(index_exports);
 // src/configurations.ts
 var import_middleware_bucket_endpoint = require("@aws-sdk/middleware-bucket-endpoint");
 function resolveS3ControlConfig(input) {
-  const { useArnRegion = false } = input;
+  const { useArnRegion } = input;
   return Object.assign(input, {
     useArnRegion: typeof useArnRegion === "function" ? useArnRegion : () => Promise.resolve(useArnRegion)
   });
@@ -106,37 +106,21 @@ var parseOutpostArnablesMiddleaware = /* @__PURE__ */ __name((options) => (next,
   context[CONTEXT_SIGNING_REGION] = useArnRegion ? arn.region : signingRegion;
   if (!input.AccountId) {
     input.AccountId = arn.accountId;
-  } else if (input.AccountId !== arn.accountId) {
-    throw new Error(`AccountId is incompatible with account id inferred from ${parameter}`);
   }
   if (useArnRegion) context[CONTEXT_ARN_REGION] = arn.region;
   return next(args);
 }, "parseOutpostArnablesMiddleaware");
 var parseOutpostArnablesMiddleawareOptions = {
-  step: "initialize",
+  toMiddleware: "serializerMiddleware",
+  relation: "before",
   tags: ["CONVERT_ARN", "OUTPOST_BUCKET_ARN", "OUTPOST_ACCESS_POINT_ARN", "OUTPOST"],
   name: "parseOutpostArnablesMiddleaware"
 };
-var validateOutpostsArn = /* @__PURE__ */ __name((arn, {
-  clientRegion,
-  signingRegion,
-  clientPartition,
-  useArnRegion,
-  useFipsEndpoint,
-  useDualstackEndpoint
-}) => {
+var validateOutpostsArn = /* @__PURE__ */ __name((arn, { clientPartition }) => {
   const { service, partition: partition2, accountId, region } = arn;
   (0, import_middleware_bucket_endpoint.validateOutpostService)(service);
   (0, import_middleware_bucket_endpoint.validatePartition)(partition2, { clientPartition });
   (0, import_middleware_bucket_endpoint.validateAccountId)(accountId);
-  (0, import_middleware_bucket_endpoint.validateRegion)(region, {
-    useArnRegion,
-    clientRegion,
-    clientSigningRegion: signingRegion,
-    useFipsEndpoint,
-    allowFipsRegion: true
-  });
-  (0, import_middleware_bucket_endpoint.validateNoDualstack)(useDualstackEndpoint);
 }, "validateOutpostsArn");
 var parseOutpostsAccessPointArnResource = /* @__PURE__ */ __name((resource) => {
   const { outpostId, accesspointName } = (0, import_middleware_bucket_endpoint.getArnResources)(resource);
@@ -190,8 +174,12 @@ var ACCOUNT_ID_HEADER = "x-amz-account-id";
 var OUTPOST_ID_HEADER = "x-amz-outpost-id";
 var updateArnablesRequestMiddleware = /* @__PURE__ */ __name((config) => (next, context) => async (args) => {
   const { request } = args;
-  if (!import_protocol_http.HttpRequest.isInstance(request)) return next(args);
-  if (context[CONTEXT_ACCOUNT_ID]) request.headers[ACCOUNT_ID_HEADER] = context[CONTEXT_ACCOUNT_ID];
+  if (!import_protocol_http.HttpRequest.isInstance(request)) {
+    return next(args);
+  }
+  if (context[CONTEXT_ACCOUNT_ID]) {
+    request.headers[ACCOUNT_ID_HEADER] = context[CONTEXT_ACCOUNT_ID];
+  }
   if (context[CONTEXT_OUTPOST_ID]) {
     const { isCustomEndpoint } = config;
     const useFipsEndpoint = await config.useFipsEndpoint();
@@ -205,7 +193,8 @@ var updateArnablesRequestMiddleware = /* @__PURE__ */ __name((config) => (next,
   return next(args);
 }, "updateArnablesRequestMiddleware");
 var updateArnablesRequestMiddlewareOptions = {
-  step: "build",
+  toMiddleware: "serializerMiddleware",
+  relation: "after",
   name: "updateArnablesRequestMiddleware",
   tags: ["ACCOUNT_ID", "OUTPOST_ID", "OUTPOST"]
 };
@@ -213,8 +202,8 @@ var updateArnablesRequestMiddlewareOptions = {
 // src/process-arnables-plugin/getProcessArnablesPlugin.ts
 var getProcessArnablesPlugin = /* @__PURE__ */ __name((options) => ({
   applyToStack: /* @__PURE__ */ __name((clientStack) => {
-    clientStack.add(parseOutpostArnablesMiddleaware(options), parseOutpostArnablesMiddleawareOptions);
-    clientStack.add(updateArnablesRequestMiddleware(options), updateArnablesRequestMiddlewareOptions);
+    clientStack.addRelativeTo(parseOutpostArnablesMiddleaware(options), parseOutpostArnablesMiddleawareOptions);
+    clientStack.addRelativeTo(updateArnablesRequestMiddleware(options), updateArnablesRequestMiddlewareOptions);
   }, "applyToStack")
 }), "getProcessArnablesPlugin");
 

package/dist-es/configurations.js

@@ -1,6 +1,6 @@
 export { NODE_USE_ARN_REGION_CONFIG_OPTIONS } from "@aws-sdk/middleware-bucket-endpoint";
 export function resolveS3ControlConfig(input) {
-    const { useArnRegion = false } = input;
+    const { useArnRegion } = input;
     return Object.assign(input, {
         useArnRegion: typeof useArnRegion === "function" ? useArnRegion : () => Promise.resolve(useArnRegion),
     });

package/dist-es/process-arnables-plugin/getProcessArnablesPlugin.js

@@ -2,7 +2,7 @@ import { parseOutpostArnablesMiddleaware, parseOutpostArnablesMiddleawareOptions
 import { updateArnablesRequestMiddleware, updateArnablesRequestMiddlewareOptions } from "./update-arnables-request";
 export const getProcessArnablesPlugin = (options) => ({
     applyToStack: (clientStack) => {
-        clientStack.add(parseOutpostArnablesMiddleaware(options), parseOutpostArnablesMiddleawareOptions);
-        clientStack.add(updateArnablesRequestMiddleware(options), updateArnablesRequestMiddlewareOptions);
+        clientStack.addRelativeTo(parseOutpostArnablesMiddleaware(options), parseOutpostArnablesMiddleawareOptions);
+        clientStack.addRelativeTo(updateArnablesRequestMiddleware(options), updateArnablesRequestMiddlewareOptions);
     },
 });

package/dist-es/process-arnables-plugin/parse-outpost-arnables.js

@@ -1,4 +1,4 @@
-import { getArnResources as getS3AccesspointArnResources, validateAccountId, validateNoDualstack, validateOutpostService, validatePartition, validateRegion, } from "@aws-sdk/middleware-bucket-endpoint";
+import { getArnResources as getS3AccesspointArnResources, validateAccountId, validateOutpostService, validatePartition, } from "@aws-sdk/middleware-bucket-endpoint";
 import { parse as parseArn, validate as validateArn } from "@aws-sdk/util-arn-parser";
 import { partition } from "@aws-sdk/util-endpoints";
 import { CONTEXT_ARN_REGION, CONTEXT_OUTPOST_ID, CONTEXT_SIGNING_REGION, CONTEXT_SIGNING_SERVICE } from "../constants";
@@ -52,31 +52,21 @@ export const parseOutpostArnablesMiddleaware = (options) => (next, context) => a
     if (!input.AccountId) {
         input.AccountId = arn.accountId;
     }
-    else if (input.AccountId !== arn.accountId) {
-        throw new Error(`AccountId is incompatible with account id inferred from ${parameter}`);
-    }
     if (useArnRegion)
         context[CONTEXT_ARN_REGION] = arn.region;
     return next(args);
 };
 export const parseOutpostArnablesMiddleawareOptions = {
-    step: "initialize",
+    toMiddleware: "serializerMiddleware",
+    relation: "before",
     tags: ["CONVERT_ARN", "OUTPOST_BUCKET_ARN", "OUTPOST_ACCESS_POINT_ARN", "OUTPOST"],
     name: "parseOutpostArnablesMiddleaware",
 };
-const validateOutpostsArn = (arn, { clientRegion, signingRegion, clientPartition, useArnRegion, useFipsEndpoint, useDualstackEndpoint, }) => {
+const validateOutpostsArn = (arn, { clientPartition }) => {
     const { service, partition, accountId, region } = arn;
     validateOutpostService(service);
     validatePartition(partition, { clientPartition });
     validateAccountId(accountId);
-    validateRegion(region, {
-        useArnRegion,
-        clientRegion,
-        clientSigningRegion: signingRegion,
-        useFipsEndpoint,
-        allowFipsRegion: true,
-    });
-    validateNoDualstack(useDualstackEndpoint);
 };
 const parseOutpostsAccessPointArnResource = (resource) => {
     const { outpostId, accesspointName } = getS3AccesspointArnResources(resource);

package/dist-es/process-arnables-plugin/update-arnables-request.js

@@ -5,10 +5,12 @@ const ACCOUNT_ID_HEADER = "x-amz-account-id";
 const OUTPOST_ID_HEADER = "x-amz-outpost-id";
 export const updateArnablesRequestMiddleware = (config) => (next, context) => async (args) => {
     const { request } = args;
-    if (!HttpRequest.isInstance(request))
+    if (!HttpRequest.isInstance(request)) {
         return next(args);
-    if (context[CONTEXT_ACCOUNT_ID])
+    }
+    if (context[CONTEXT_ACCOUNT_ID]) {
         request.headers[ACCOUNT_ID_HEADER] = context[CONTEXT_ACCOUNT_ID];
+    }
     if (context[CONTEXT_OUTPOST_ID]) {
         const { isCustomEndpoint } = config;
         const useFipsEndpoint = await config.useFipsEndpoint();
@@ -22,7 +24,8 @@ export const updateArnablesRequestMiddleware = (config) => (next, context) => as
     return next(args);
 };
 export const updateArnablesRequestMiddlewareOptions = {
-    step: "build",
+    toMiddleware: "serializerMiddleware",
+    relation: "after",
     name: "updateArnablesRequestMiddleware",
     tags: ["ACCOUNT_ID", "OUTPOST_ID", "OUTPOST"],
 };

package/dist-types/configurations.d.ts

@@ -7,7 +7,7 @@ export interface S3ControlInputConfig {
     /**
      * Whether to override the request region with the region inferred from requested resource's ARN. Defaults to false
      */
-    useArnRegion?: boolean | Provider<boolean>;
+    useArnRegion?: boolean | undefined | Provider<boolean | undefined>;
 }
 interface PreviouslyResolved {
     isCustomEndpoint?: boolean;
@@ -33,7 +33,7 @@ export interface S3ControlResolvedConfig {
     /**
      * Resolved value for input config {@link S3ControlInputConfig.useArnRegion}
      */
-    useArnRegion: Provider<boolean>;
+    useArnRegion: Provider<boolean | undefined>;
     /**
      * Resolved value for input config {@link RegionInputConfig.region}
      */

package/dist-types/process-arnables-plugin/parse-outpost-arnables.d.ts

@@ -1,5 +1,8 @@
-import { InitializeHandlerOptions, InitializeMiddleware } from "@smithy/types";
+import { RelativeMiddlewareOptions, SerializeMiddleware } from "@smithy/types";
 import { S3ControlResolvedConfig } from "../configurations";
+/**
+ * @internal
+ */
 type ArnableInput = {
     Name?: string;
     Bucket?: string;
@@ -9,7 +12,16 @@ type ArnableInput = {
  * Validate input `Name` or `Bucket` parameter is acceptable ARN format. If so, modify the input ARN to inferred
  * resource identifier, notify later middleware to redirect request to Outpost endpoint, signing service and signing
  * region.
+ * @internal
+ */
+export declare const parseOutpostArnablesMiddleaware: (options: S3ControlResolvedConfig) => SerializeMiddleware<ArnableInput, any>;
+/**
+ * This middleware must go after endpoint resolution and before serialization.
+ * The transform applied to the input.Bucket or input.Name ARN must not have occurred
+ * by the time endpoint resolution happens, but must have completed by the time serialization
+ * happens.
+ *
+ * @internal
  */
-export declare const parseOutpostArnablesMiddleaware: (options: S3ControlResolvedConfig) => InitializeMiddleware<ArnableInput, any>;
-export declare const parseOutpostArnablesMiddleawareOptions: InitializeHandlerOptions;
+export declare const parseOutpostArnablesMiddleawareOptions: RelativeMiddlewareOptions;
 export {};

package/dist-types/process-arnables-plugin/update-arnables-request.d.ts

@@ -1,4 +1,7 @@
-import { BuildHandlerOptions, BuildMiddleware, Provider } from "@smithy/types";
+import { Provider, RelativeMiddlewareOptions, SerializeMiddleware } from "@smithy/types";
+/**
+ * @internal
+ */
 export interface UpdateArnablesRequestMiddlewareConfig {
     isCustomEndpoint?: boolean;
     useFipsEndpoint: Provider<boolean>;
@@ -6,6 +9,11 @@ export interface UpdateArnablesRequestMiddlewareConfig {
 /**
  * After outpost request is constructed, redirect request to outpost endpoint and set `x-amz-account-id` and
  * `x-amz-outpost-id` headers.
+ *
+ * @internal
+ */
+export declare const updateArnablesRequestMiddleware: (config: UpdateArnablesRequestMiddlewareConfig) => SerializeMiddleware<any, any>;
+/**
+ * @internal
  */
-export declare const updateArnablesRequestMiddleware: (config: UpdateArnablesRequestMiddlewareConfig) => BuildMiddleware<any, any>;
-export declare const updateArnablesRequestMiddlewareOptions: BuildHandlerOptions;
+export declare const updateArnablesRequestMiddlewareOptions: RelativeMiddlewareOptions;

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

@@ -1,7 +1,7 @@
 import { Provider, RegionInfoProvider } from "@smithy/types";
 export { NODE_USE_ARN_REGION_CONFIG_OPTIONS } from "@aws-sdk/middleware-bucket-endpoint";
 export interface S3ControlInputConfig {
-  useArnRegion?: boolean | Provider<boolean>;
+  useArnRegion?: boolean | undefined | Provider<boolean | undefined>;
 }
 interface PreviouslyResolved {
   isCustomEndpoint?: boolean;
@@ -14,7 +14,7 @@ export interface S3ControlResolvedConfig {
   isCustomEndpoint?: boolean;
   useFipsEndpoint: Provider<boolean>;
   useDualstackEndpoint: Provider<boolean>;
-  useArnRegion: Provider<boolean>;
+  useArnRegion: Provider<boolean | undefined>;
   region: Provider<string>;
   regionInfoProvider?: RegionInfoProvider;
 }

package/dist-types/ts3.4/process-arnables-plugin/parse-outpost-arnables.d.ts

@@ -1,4 +1,4 @@
-import { InitializeHandlerOptions, InitializeMiddleware } from "@smithy/types";
+import { RelativeMiddlewareOptions, SerializeMiddleware } from "@smithy/types";
 import { S3ControlResolvedConfig } from "../configurations";
 type ArnableInput = {
   Name?: string;
@@ -7,6 +7,6 @@ type ArnableInput = {
 };
 export declare const parseOutpostArnablesMiddleaware: (
   options: S3ControlResolvedConfig
-) => InitializeMiddleware<ArnableInput, any>;
-export declare const parseOutpostArnablesMiddleawareOptions: InitializeHandlerOptions;
+) => SerializeMiddleware<ArnableInput, any>;
+export declare const parseOutpostArnablesMiddleawareOptions: RelativeMiddlewareOptions;
 export {};

package/dist-types/ts3.4/process-arnables-plugin/update-arnables-request.d.ts

@@ -1,9 +1,13 @@
-import { BuildHandlerOptions, BuildMiddleware, Provider } from "@smithy/types";
+import {
+  Provider,
+  RelativeMiddlewareOptions,
+  SerializeMiddleware,
+} from "@smithy/types";
 export interface UpdateArnablesRequestMiddlewareConfig {
   isCustomEndpoint?: boolean;
   useFipsEndpoint: Provider<boolean>;
 }
 export declare const updateArnablesRequestMiddleware: (
   config: UpdateArnablesRequestMiddlewareConfig
-) => BuildMiddleware<any, any>;
-export declare const updateArnablesRequestMiddlewareOptions: BuildHandlerOptions;
+) => SerializeMiddleware<any, any>;
+export declare const updateArnablesRequestMiddlewareOptions: RelativeMiddlewareOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-sdk-s3-control",
-  "version": "3.821.0",
+  "version": "3.830.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline middleware-sdk-s3-control",
@@ -24,10 +24,10 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/middleware-bucket-endpoint": "3.821.0",
+    "@aws-sdk/middleware-bucket-endpoint": "3.830.0",
     "@aws-sdk/types": "3.821.0",
     "@aws-sdk/util-arn-parser": "3.804.0",
-    "@aws-sdk/util-endpoints": "3.821.0",
+    "@aws-sdk/util-endpoints": "3.828.0",
     "@smithy/protocol-http": "^5.1.2",
     "@smithy/types": "^4.3.1",
     "@smithy/util-endpoints": "^3.0.6",