test: update tests

Author: trivikr

packages/middleware-sdk-s3-control/src/process-arnables-plugin/plugin.spec.ts

@@ -20,6 +20,7 @@ describe("getProcessArnablesMiddleware", () => {
       regionInfoProvider: options.regionInfoProvider ?? jest.fn().mockResolvedValue({ partition: "aws" }),
       region: jest.fn().mockResolvedValue(options.region),
       useArnRegion: jest.fn().mockResolvedValue(options.useArnRegion ?? false),
+      isCustomEndpoint: false,
     };
   };
 

packages/middleware-sdk-s3-control/src/process-arnables-plugin/update-arnables-request.ts

@@ -12,17 +12,18 @@ const REGEX_S3CONTROL_HOSTNAME = /^(.+\.)?s3-control[.-]([a-z0-9-]+)\./;
  * After outpost request is constructed, redirect request to outpost endpoint and set `x-amz-account-id` and
  * `x-amz-outpost-id` headers.
  */
-export const updateArnablesRequestMiddleware = (options: S3ControlResolvedConfig): BuildMiddleware<any, any> => (
-  next,
-  context
-) => (args) => {
+export const updateArnablesRequestMiddleware = ({
+  isCustomEndpoint,
+}: {
+  isCustomEndpoint: boolean;
+}): BuildMiddleware<any, any> => (next, context) => (args) => {
   const { request } = args;
   if (!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]) {
     request.headers[OUTPOST_ID_HEADER] = context[CONTEXT_OUTPOST_ID];
     request.hostname = getOutpostEndpoint(request.hostname, {
-      isCustomEndpoint: options.isCustomEndpoint,
+      isCustomEndpoint,
       regionOverride: context[CONTEXT_ARN_REGION],
     });
   }

packages/middleware-sdk-s3-control/src/redirect-from-postid.spec.ts

@@ -6,10 +6,7 @@ describe("redirectFromPostIdMiddleware", () => {
   it("should redirect request if Bucket is a valid ARN", async () => {
     const next: any = (args: any) => ({ output: args.request });
     const context: any = {};
-    const { output } = await redirectFromPostIdMiddleware(
-      next,
-      context
-    )({
+    const { output } = await redirectFromPostIdMiddleware({ isCustomEndpoint: false })(next, context)({
       input: { OutpostId: "op-123" },
       request: new HttpRequest({ hostname: "123456789012.s3-control.us-west-2.amazonaws.com" }),
     });

packages/middleware-sdk-s3-control/src/redirect-from-postid.ts

@@ -13,14 +13,15 @@ type InputType = {
  * If OutpostId is set, redirect hostname to Outpost one, and change signing service to `s3-outposts`.
  * Applied to S3Control.CreateBucket and S3Control.ListRegionalBuckets
  */
-export const redirectFromPostIdMiddleware = (options: S3ControlResolvedConfig): BuildMiddleware<InputType, any> => (
-  next,
-  context
-) => (args) => {
+export const redirectFromPostIdMiddleware = ({
+  isCustomEndpoint,
+}: {
+  isCustomEndpoint: boolean;
+}): BuildMiddleware<InputType, any> => (next, context) => (args) => {
   const { input, request } = args;
   if (!HttpRequest.isInstance(request)) return next(args);
   if (input.OutpostId) {
-    request.hostname = getOutpostEndpoint(request.hostname);
+    request.hostname = getOutpostEndpoint(request.hostname, { isCustomEndpoint });
     context[CONTEXT_SIGNING_SERVICE] = "s3-outposts";
   }
   return next(args);