From 01a6b28c0ab5a30ae938025a454cf1f3bebb2eb8 Mon Sep 17 00:00:00 2001 From: Joe Hanley Date: Wed, 17 Mar 2021 09:25:10 -0700 Subject: [PATCH] Fixing support for ingress settings on Cloud Functions --- src/deploy/functions/tasks.ts | 2 ++ src/gcp/cloudfunctions.ts | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/src/deploy/functions/tasks.ts b/src/deploy/functions/tasks.ts index 01330adf524..3ab3bfb713f 100644 --- a/src/deploy/functions/tasks.ts +++ b/src/deploy/functions/tasks.ts @@ -66,6 +66,7 @@ export function createFunctionTask( vpcConnector: fn.vpcConnector, vpcConnectorEgressSettings: fn.vpcConnectorEgressSettings, serviceAccountEmail: fn.serviceAccountEmail, + ingressSettings: fn.ingressSettings, }); const pollerOptions: OperationPollerOptions = Object.assign( { @@ -130,6 +131,7 @@ export function updateFunctionTask( vpcConnector: fn.vpcConnector, vpcConnectorEgressSettings: fn.vpcConnectorEgressSettings, serviceAccountEmail: fn.serviceAccountEmail, + ingressSettings: fn.ingressSettings, }); const pollerOptions: OperationPollerOptions = Object.assign( { diff --git a/src/gcp/cloudfunctions.ts b/src/gcp/cloudfunctions.ts index a09dcac5085..a560c6684a0 100644 --- a/src/gcp/cloudfunctions.ts +++ b/src/gcp/cloudfunctions.ts @@ -125,6 +125,9 @@ export async function createFunction(options: any): Promise { if (options.sourceToken) { data.sourceToken = options.sourceToken; } + if (options.ingressSettings) { + data.ingressSettings = options.ingressSettings; + } try { const res = await api.request("POST", endpoint, { auth: true, @@ -234,6 +237,10 @@ export async function updateFunction(options: any): Promise { data.sourceToken = options.sourceToken; masks.push("sourceToken"); } + if (options.ingressSettings) { + data.ingressSettings = options.ingressSettings; + masks.push("ingressSettings"); + } if (options.trigger.eventTrigger) { masks = _.concat( masks,