fix(middleware-sdk-s3-control): add check for -fips in REGEX_S3CONTROL_HOSTNAME

Author: trivikr

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

@@ -1,31 +1,38 @@
 import { getOutpostEndpoint } from "./getOutpostEndpoint";
 
 describe(getOutpostEndpoint.name, () => {
-  const mockRegion = "region";
-  const mockDnsSuffix = "mockDnsSuffix";
-  const mockHostname = `s3-control.${mockRegion}.${mockDnsSuffix}`;
   const mockInput = { isCustomEndpoint: false, useFipsEndpoint: false };
-
   it("returns hostname if custom endpoint is set", () => {
+    const mockHostname = "mock.hostname.com";
     expect(getOutpostEndpoint(mockHostname, { ...mockInput, isCustomEndpoint: true })).toStrictEqual(mockHostname);
   });
 
   describe("returns outpost endpoint", () => {
-    it("uses region from hostname if regionOverride if provided", () => {
-      expect(getOutpostEndpoint(mockHostname, mockInput)).toStrictEqual(`s3-outposts.${mockRegion}.${mockDnsSuffix}`);
-    });
+    const mockRegion = "region";
+    const mockDnsSuffix = "mockDnsSuffix";
+
+    const testOutpostEndpoint = (useFipsEndpoint: boolean) => {
+      const mockHostname = `s3-control${useFipsEndpoint ? "-fips" : ""}.${mockRegion}.${mockDnsSuffix}`;
+      it("uses region from hostname if regionOverride if provided", () => {
+        expect(getOutpostEndpoint(mockHostname, { ...mockInput, useFipsEndpoint })).toStrictEqual(
+          `s3-outposts${useFipsEndpoint ? "-fips" : ""}.${mockRegion}.${mockDnsSuffix}`
+        );
+      });
+
+      it("uses region from regionOverride if provided", () => {
+        const mockRegionOverride = "mockRegionOverride";
+        expect(
+          getOutpostEndpoint(mockHostname, { ...mockInput, useFipsEndpoint, regionOverride: mockRegionOverride })
+        ).toStrictEqual(`s3-outposts${useFipsEndpoint ? "-fips" : ""}.${mockRegionOverride}.${mockDnsSuffix}`);
+      });
+    };
 
-    it("uses region from regionOverride if provided", () => {
-      const mockRegionOverride = "mockRegionOverride";
-      expect(getOutpostEndpoint(mockHostname, { ...mockInput, regionOverride: mockRegionOverride })).toStrictEqual(
-        `s3-outposts.${mockRegionOverride}.${mockDnsSuffix}`
-      );
+    describe("with FIPS", () => {
+      testOutpostEndpoint(true);
     });
 
-    it(`adds suffix "-fips" if useFipsEndpoint is set`, () => {
-      expect(getOutpostEndpoint(mockHostname, { ...mockInput, useFipsEndpoint: true })).toStrictEqual(
-        `s3-outposts-fips.${mockRegion}.${mockDnsSuffix}`
-      );
+    describe("without FIPS", () => {
+      testOutpostEndpoint(false);
     });
   });
 });

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

@@ -1,4 +1,4 @@
-const REGEX_S3CONTROL_HOSTNAME = /^(.+\.)?s3-control[.-]([a-z0-9-]+)\./;
+const REGEX_S3CONTROL_HOSTNAME = /^(.+\.)?s3-control(-fips)?[.-]([a-z0-9-]+)\./;
 
 export interface GetOutpostEndpointOptions {
   isCustomEndpoint?: boolean;
@@ -10,15 +10,17 @@ export const getOutpostEndpoint = (
   hostname: string,
   { isCustomEndpoint, regionOverride, useFipsEndpoint }: GetOutpostEndpointOptions
 ): string => {
-  const [matched, prefix, region] = hostname.match(REGEX_S3CONTROL_HOSTNAME)!;
-  // hostname prefix will be ignored even if presents
-  return isCustomEndpoint
-    ? hostname
-    : [
-        `s3-outposts${useFipsEndpoint ? "-fips" : ""}`,
-        regionOverride || region,
-        hostname.replace(new RegExp(`^${matched}`), ""),
-      ]
-        .filter((part) => part !== undefined)
-        .join(".");
+  if (isCustomEndpoint) {
+    return hostname;
+  }
+
+  const [matched, prefix, fips, region] = hostname.match(REGEX_S3CONTROL_HOSTNAME)!;
+  // hostname prefix will be ignored even if it is present
+  return [
+    `s3-outposts${useFipsEndpoint ? "-fips" : ""}`,
+    regionOverride || region,
+    hostname.replace(new RegExp(`^${matched}`), ""),
+  ]
+    .filter((part) => part !== undefined)
+    .join(".");
 };