@resistdesign/voltra 3.0.0-alpha.40 → 3.0.0-alpha.41

package/iac/packs/gateway.d.ts

@@ -63,7 +63,7 @@ export type AddGatewayConfig = {
      */
     authorizer?: AddGatewayAuthorizerConfig | boolean;
     /**
-     * Suffix to ensure unique deployment ids.
+     * Optional manual suffix appended after the deterministic deployment hash.
      */
     deploymentSuffix?: string;
 };

package/iac/packs/index.js

@@ -950,6 +950,31 @@ var addSecureFileStorage = createResourcePack(
 );
 
 // src/iac/packs/gateway.ts
+var canonicalizeHashableValue = (value) => {
+  if (Array.isArray(value)) {
+    return value.map((item) => canonicalizeHashableValue(item));
+  }
+  if (value && typeof value === "object") {
+    const output = {};
+    Object.keys(value).sort().forEach((key) => {
+      output[key] = canonicalizeHashableValue(
+        value[key]
+      );
+    });
+    return output;
+  }
+  return value;
+};
+var getDeterministicHash = (value) => {
+  const canonical = JSON.stringify(canonicalizeHashableValue(value));
+  let hash = 2166136261;
+  for (let i = 0; i < canonical.length; i += 1) {
+    hash ^= canonical.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+    hash >>>= 0;
+  }
+  return hash.toString(16).toUpperCase().padStart(8, "0");
+};
 var DEFAULT_AUTH_TYPE = "COGNITO_USER_POOLS";
 var addGateway = createResourcePack(
   ({
@@ -974,6 +999,27 @@ var addGateway = createResourcePack(
       providerARNs,
       identitySource = "method.request.header.Authorization"
     } = !!authorizer && typeof authorizer === "object" ? authorizer : {};
+    const cloudFunctionIntegration = {
+      Type: "AWS_PROXY",
+      IntegrationHttpMethod: "POST",
+      Uri: cloudFunctionUri
+    };
+    const gatewayResponseParameters = {
+      "gatewayresponse.header.Access-Control-Allow-Origin": "method.request.header.origin",
+      "gatewayresponse.header.Access-Control-Allow-Credentials": "'true'",
+      "gatewayresponse.header.Access-Control-Allow-Headers": "'*'"
+    };
+    const cloudFunctionPermissionSourceArn = {
+      "Fn::Sub": [
+        "arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${__ApiId__}/${__Stage__}/*/*",
+        {
+          __Stage__: stageName,
+          __ApiId__: {
+            Ref: id
+          }
+        }
+      ]
+    };
     const authorizerId = `${id}CustomAuthorizer`;
     const authProps = !!authorizer ? {
       AuthorizationScopes: authScopes,
@@ -984,7 +1030,33 @@ var addGateway = createResourcePack(
     } : {
       AuthorizationType: "NONE"
     };
-    const fullDeploymentId = `${id}GatewayRESTAPIDeployment${deploymentSuffix}`;
+    const gatewayDeploymentFingerprint = {
+      restApiEndpointTypes: ["EDGE"],
+      proxyPathPart: "{proxy+}",
+      anyMethod: {
+        ...authProps,
+        HttpMethod: "ANY",
+        Integration: cloudFunctionIntegration
+      },
+      optionsMethod: {
+        AuthorizationType: "NONE",
+        HttpMethod: "OPTIONS",
+        Integration: cloudFunctionIntegration
+      },
+      gatewayResponseDefault4XX: {
+        ResponseParameters: gatewayResponseParameters,
+        ResponseType: "DEFAULT_4XX"
+      },
+      stageName,
+      cloudFunctionPermissionSourceArn,
+      authorizer: !!authorizer ? {
+        IdentitySource: identitySource,
+        ProviderARNs: providerARNs,
+        Type: "COGNITO_USER_POOLS"
+      } : null
+    };
+    const deploymentHash = getDeterministicHash(gatewayDeploymentFingerprint);
+    const fullDeploymentId = `${id}GatewayRESTAPIDeployment${deploymentHash}${deploymentSuffix}`;
     return new SimpleCFT().patch({
       Resources: {
         // REST API
@@ -1025,9 +1097,7 @@ var addGateway = createResourcePack(
               Ref: id
             },
             Integration: {
-              Type: "AWS_PROXY",
-              IntegrationHttpMethod: "POST",
-              Uri: cloudFunctionUri
+              ...cloudFunctionIntegration
             }
           }
         },
@@ -1044,9 +1114,7 @@ var addGateway = createResourcePack(
               Ref: id
             },
             Integration: {
-              Type: "AWS_PROXY",
-              IntegrationHttpMethod: "POST",
-              Uri: cloudFunctionUri
+              ...cloudFunctionIntegration
             }
           }
         }
@@ -1067,9 +1135,7 @@ var addGateway = createResourcePack(
               Ref: id
             },
             Integration: {
-              Type: "AWS_PROXY",
-              IntegrationHttpMethod: "POST",
-              Uri: cloudFunctionUri
+              ...cloudFunctionIntegration
             }
           }
         },
@@ -1086,21 +1152,15 @@ var addGateway = createResourcePack(
               Ref: id
             },
             Integration: {
-              Type: "AWS_PROXY",
-              IntegrationHttpMethod: "POST",
-              Uri: cloudFunctionUri
+              ...cloudFunctionIntegration
             }
           }
         },
         [`${id}GatewayResponseDefault4XX`]: {
           Type: "AWS::ApiGateway::GatewayResponse",
           Properties: {
-            ResponseParameters: {
-              // Not authorized, so just allow the current origin by mapping it into the header.
-              "gatewayresponse.header.Access-Control-Allow-Origin": "method.request.header.origin",
-              "gatewayresponse.header.Access-Control-Allow-Credentials": "'true'",
-              "gatewayresponse.header.Access-Control-Allow-Headers": "'*'"
-            },
+            // Not authorized, so just allow the current origin by mapping it into the header.
+            ResponseParameters: gatewayResponseParameters,
             ResponseType: "DEFAULT_4XX",
             RestApiId: {
               Ref: id
@@ -1256,15 +1316,7 @@ var addGateway = createResourcePack(
               "Fn::GetAtt": [cloudFunctionId, "Arn"]
             },
             SourceArn: {
-              "Fn::Sub": [
-                "arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${__ApiId__}/${__Stage__}/*/*",
-                {
-                  __Stage__: stageName,
-                  __ApiId__: {
-                    Ref: id
-                  }
-                }
-              ]
+              ...cloudFunctionPermissionSourceArn
             }
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resistdesign/voltra",
-  "version": "3.0.0-alpha.40",
+  "version": "3.0.0-alpha.41",
   "description": "With our powers combined!",
   "homepage": "https://voltra.app",
   "repository": "git@github.com:resistdesign/voltra.git",