fix(functions): Set serviceAccount for Cloud Functions when custom service account is specified

src/gcp/cloudfunctionsv2.spec.ts

@@ -244,6 +244,10 @@
 
       const fullGcfFunction: cloudfunctionsv2.InputCloudFunction = {
         ...CLOUD_FUNCTION_V2,
+        buildConfig: {
+          ...CLOUD_FUNCTION_V2.buildConfig,
+          serviceAccount: "projects/project/serviceAccounts/inlined@google.com",
+        },
         labels: {
           ...CLOUD_FUNCTION_V2.labels,
           foo: "bar",
@@ -332,6 +336,10 @@
 
       const saGcfFunction: cloudfunctionsv2.InputCloudFunction = {
         ...CLOUD_FUNCTION_V2,
+        buildConfig: {
+          ...CLOUD_FUNCTION_V2.buildConfig,
+          serviceAccount: "projects/project/serviceAccounts/sa@google.com",
+        },
         eventTrigger: {
           eventType: events.v2.DATABASE_EVENTS[0],
           eventFilters: [
@@ -405,6 +413,10 @@
         }),
       ).to.deep.equal({
         ...CLOUD_FUNCTION_V2,
+        buildConfig: {
+          ...CLOUD_FUNCTION_V2.buildConfig,
+          serviceAccount: `projects/${ENDPOINT.project}/serviceAccounts/sa@${ENDPOINT.project}.iam.gserviceaccount.com`,
+        },
         serviceConfig: {
           ...CLOUD_FUNCTION_V2.serviceConfig,
           serviceAccountEmail: `sa@${ENDPOINT.project}.iam.gserviceaccount.com`,
@@ -421,6 +433,10 @@
         }),
       ).to.deep.equal({
         ...CLOUD_FUNCTION_V2,
+        buildConfig: {
+          ...CLOUD_FUNCTION_V2.buildConfig,
+          serviceAccount: null,
+        },
         serviceConfig: {
           ...CLOUD_FUNCTION_V2.serviceConfig,
           serviceAccountEmail: null,
@@ -835,15 +851,15 @@
 
       const scope = nock(functionsV2Origin())
         .post("/v2/projects/project/locations/region/functions", (body) => {
           expect(body.serviceConfig.environmentVariables).to.have.property(
             "LOG_EXECUTION_ID",
             "true",
           );
           expect(body.serviceConfig.environmentVariables).to.have.property(
             "FUNCTION_TARGET",
             "function",
           );
           expect(body.buildConfig.environmentVariables).to.have.property(
             "GOOGLE_NODE_RUN_SCRIPTS",
             "",
           );
@@ -861,15 +877,15 @@
     it("should set default environment variables", async () => {
       const scope = nock(functionsV2Origin())
         .patch("/v2/projects/project/locations/region/functions/id", (body) => {
           expect(body.serviceConfig.environmentVariables).to.have.property(
             "LOG_EXECUTION_ID",
             "true",
           );
           expect(body.serviceConfig.environmentVariables).to.have.property(
             "FUNCTION_TARGET",
             "function",
           );
           expect(body.buildConfig.environmentVariables).to.have.property(
             "GOOGLE_NODE_RUN_SCRIPTS",
             "",
           );

src/gcp/cloudfunctionsv2.ts

@@ -51,6 +51,7 @@
   source: Source;
   sourceToken?: string;
   environmentVariables: Record<string, string>;
+  serviceAccount?: string | null;
 
   // Output only
   build?: string;
@@ -215,10 +216,10 @@
  * @param type Type of deployment - create, update, or delete.
  * @param err The error returned from the operation.
  */
 function functionsOpLogReject(func: InputCloudFunction, type: string, err: any): void {
   // Sniff for runtime validation errors and log a more user-friendly warning.
   if (err?.message?.includes("Runtime validation errors")) {
     const capturedMessage = captureRuntimeValidationError(err.message);
     utils.logLabeledWarning("functions", capturedMessage + " for function " + func.name);
   }
   if (err?.message?.includes("maxScale may not exceed")) {
@@ -467,16 +468,18 @@
     "ingressSettings",
     "timeoutSeconds",
   );
-  proto.convertIfPresent(
-    gcfFunction.serviceConfig,
-    endpoint,
-    "serviceAccountEmail",
-    "serviceAccount",
-    (from) =>
-      !from
-        ? null
-        : proto.formatServiceAccount(from, endpoint.project, true /* removeTypePrefix */),
-  );
+
+  if (Object.prototype.hasOwnProperty.call(endpoint, "serviceAccount")) {
+    const serviceAccount = endpoint.serviceAccount;
+    if (!serviceAccount) {
+      gcfFunction.buildConfig.serviceAccount = null;
+      gcfFunction.serviceConfig.serviceAccountEmail = null;
+    } else {
+      const email = proto.formatServiceAccount(serviceAccount, endpoint.project, true);
+      gcfFunction.buildConfig.serviceAccount = `projects/${endpoint.project}/serviceAccounts/${email}`;
+      gcfFunction.serviceConfig.serviceAccountEmail = email;
+    }
+  }
   // Memory must be set because the default value of GCF gen 2 is Megabytes and
   // we use mebibytes
   const mem = endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;