Adds support for vpcConnector and vpcConnectorEgressSettings customization for functions (#2525)

Co-authored-by: Lauren Long <laurenzlong@users.noreply.github.com>

Author: pcboy

src/deploy/functions/release.js

@@ -258,6 +258,8 @@ module.exports = function(context, options, payload) {
                   timeout: functionInfo.timeout,
                   maxInstances: functionInfo.maxInstances,
                   environmentVariables: defaultEnvVariables,
+                  vpcConnector: functionInfo.vpcConnector,
+                  vpcConnectorEgressSettings: functionInfo.vpcConnectorEgressSettings,
                 })
                 .then((createRes) => {
                   if (_.has(functionTrigger, "httpsTrigger")) {
@@ -333,6 +335,8 @@ module.exports = function(context, options, payload) {
               timeout: functionInfo.timeout,
               runtime: runtime,
               maxInstances: functionInfo.maxInstances,
+              vpcConnector: functionInfo.vpcConnector,
+              vpcConnectorEgressSettings: functionInfo.vpcConnectorEgressSettings,
               environmentVariables: _.assign(
                 {},
                 existingFunction.environmentVariables,

src/gcp/cloudfunctions.js

@@ -65,13 +65,25 @@ function _createFunction(options) {
   const location = "projects/" + options.projectId + "/locations/" + options.region;
   const func = location + "/functions/" + options.functionName;
   const endpoint = "/" + API_VERSION + "/" + location + "/functions";
+
   const data = {
     sourceUploadUrl: options.sourceUploadUrl,
     name: func,
     entryPoint: options.entryPoint,
     labels: options.labels,
     runtime: options.runtime,
   };
+
+  if (options.vpcConnector) {
+    data.vpcConnector = options.vpcConnector;
+    // use implied project/location if only given connector id
+    if (!data.vpcConnector.includes("/")) {
+      data.vpcConnector = `${location}/connectors/${data.vpcConnector}`;
+    }
+  }
+  if (options.vpcConnectorEgressSettings) {
+    data.vpcConnectorEgressSettings = options.vpcConnectorEgressSettings;
+  }
   if (options.availableMemoryMb) {
     data.availableMemoryMb = options.availableMemoryMb;
   }
@@ -143,6 +155,7 @@ function _updateFunction(options) {
   const location = "projects/" + options.projectId + "/locations/" + options.region;
   const func = location + "/functions/" + options.functionName;
   const endpoint = "/" + API_VERSION + "/" + func;
+
   const data = _.assign(
     {
       sourceUploadUrl: options.sourceUploadUrl,
@@ -153,6 +166,18 @@ function _updateFunction(options) {
   );
   let masks = ["sourceUploadUrl", "name", "labels"];
 
+  if (options.vpcConnector) {
+    data.vpcConnector = options.vpcConnector;
+    // use implied project/location if only given connector id
+    if (!data.vpcConnector.includes("/")) {
+      data.vpcConnector = `${location}/connectors/${data.vpcConnector}`;
+    }
+    masks.push("vpcConnector");
+  }
+  if (options.vpcConnectorEgressSettings) {
+    data.vpcConnectorEgressSettings = options.vpcConnectorEgressSettings;
+    masks.push("vpcConnectorEgressSettings");
+  }
   if (options.runtime) {
     data.runtime = options.runtime;
     masks = _.concat(masks, "runtime");