PR feedback RE error checking

Author: inlined

src/deploy/functions/runtimes/discovery/v1alpha1.spec.ts

@@ -108,6 +108,37 @@ describe("buildFromV1Alpha", () => {
       }
     }); // Top level function keys
 
+    describe("VPC settings", () => {
+      it("throws when both connector and networkInterfaces are specified", () => {
+        assertParserError({
+          endpoints: {
+            func: {
+              ...MIN_ENDPOINT,
+              httpsTrigger: {},
+              vpc: {
+                connector: "connector",
+                networkInterfaces: [{ network: "network" }],
+              },
+            },
+          },
+        });
+      });
+
+      it("throws when neither connector nor networkInterfaces are specified", () => {
+        assertParserError({
+          endpoints: {
+            func: {
+              ...MIN_ENDPOINT,
+              httpsTrigger: {},
+              vpc: {
+                egressSettings: "ALL_TRAFFIC",
+              },
+            },
+          },
+        });
+      });
+    });
+
     describe("Event triggers", () => {
       const validTrigger: build.EventTrigger = {
         eventType: "google.pubsub.v1.topic.publish",

src/deploy/functions/runtimes/discovery/v1alpha1.ts

@@ -189,6 +189,11 @@ function assertBuildEndpoint(ep: WireEndpoint, id: string): void {
         `VPC settings on ${id} must specify either 'connector' or 'networkInterfaces'`,
       );
     }
+    if (ep.vpc.connector && ep.vpc.networkInterfaces) {
+      throw new FirebaseError(
+        `VPC settings on ${id} cannot specify both 'connector' and 'networkInterfaces'`,
+      );
+    }
   }
   let triggerCount = 0;
   if (ep.httpsTrigger) {

src/gcp/cloudfunctionsv2.spec.ts

@@ -307,6 +307,39 @@ describe("cloudfunctionsv2", () => {
       expect(reverted.vpc).to.deep.equal(endpointWithNi.vpc);
     });
 
+    it("should throw on unexpected VPC egress setting", () => {
+      expect(() => {
+        cloudfunctionsv2.endpointFromFunction({
+          ...HAVE_CLOUD_FUNCTION_V2,
+          serviceConfig: {
+            ...HAVE_CLOUD_FUNCTION_V2.serviceConfig,
+            directVpcNetworkInterface: [{ network: "my-net" }],
+            directVpcEgress: "ALL_TRAFFIC" as any,
+            uri: RUN_URI,
+            service: "service",
+          },
+        } as cloudfunctionsv2.OutputCloudFunction);
+      }).to.throw("Unexpected VPC egress setting: ALL_TRAFFIC");
+    });
+
+    it("should ignore VPC_EGRESS_UNSPECIFIED", () => {
+      const gcf = {
+        ...HAVE_CLOUD_FUNCTION_V2,
+        serviceConfig: {
+          ...HAVE_CLOUD_FUNCTION_V2.serviceConfig,
+          directVpcNetworkInterface: [{ network: "my-net" }],
+          directVpcEgress: "VPC_EGRESS_UNSPECIFIED" as any,
+          uri: RUN_URI,
+          service: "service",
+        },
+      } as cloudfunctionsv2.OutputCloudFunction;
+      const endpoint = cloudfunctionsv2.endpointFromFunction(gcf);
+      expect(endpoint.vpc).to.deep.equal({
+        networkInterfaces: [{ network: "my-net" }],
+      });
+      expect(endpoint.vpc?.egressSettings).to.be.undefined;
+    });
+
     it("should calculate non-trivial fields", () => {
       const complexEndpoint: backend.Endpoint = {
         ...ENDPOINT,

src/gcp/cloudfunctionsv2.ts

@@ -755,13 +755,17 @@ export function endpointFromFunction(gcfFunction: OutputCloudFunction): backend.
       );
     } else if (gcfFunction.serviceConfig.directVpcNetworkInterface) {
       endpoint.vpc = { networkInterfaces: gcfFunction.serviceConfig.directVpcNetworkInterface };
-      if (
-        gcfFunction.serviceConfig.directVpcEgress &&
-        gcfFunction.serviceConfig.directVpcEgress !== "VPC_EGRESS_UNSPECIFIED"
-      ) {
-        endpoint.vpc.egressSettings = gcfFunction.serviceConfig.directVpcEgress.substring(
-          "VPC_EGRESS_".length,
-        ) as backend.VpcEgressSettings;
+      if (gcfFunction.serviceConfig.directVpcEgress) {
+        if (!gcfFunction.serviceConfig.directVpcEgress.startsWith("VPC_EGRESS_")) {
+          throw new FirebaseError(
+            `Unexpected VPC egress setting: ${gcfFunction.serviceConfig.directVpcEgress}`,
+          );
+        }
+        if (gcfFunction.serviceConfig.directVpcEgress !== "VPC_EGRESS_UNSPECIFIED") {
+          endpoint.vpc.egressSettings = gcfFunction.serviceConfig.directVpcEgress.substring(
+            "VPC_EGRESS_".length,
+          ) as backend.VpcEgressSettings;
+        }
       }
     }
     const serviceName = gcfFunction.serviceConfig.service;