Merge branch 'master' into ah/storemu-append-fix

firebase · May 26, 2021 · 5086201 · 5086201
2 parents bc53d62 + a1f2e85
commit 5086201
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,3 +6,4 @@
 - Fixes deleting custom metadata in Storage emulator. (#3385)
 - Fixes errors when calling makePublic() with Storage Emulator(#3394)
 - Fixes mishandling of bytes when uploading two files with the same name in the Storage Emulator (#3406)
+- Adds support for setting user labels on scheduled functions.
diff --git a/src/deploy/functions/discovery/jsexports/parseTriggers.ts b/src/deploy/functions/discovery/jsexports/parseTriggers.ts
@@ -227,7 +227,10 @@ export function addResourcesToBackend(
         cloudFunction.trigger.eventFilters.resource = `${cloudFunction.trigger.eventFilters.resource}/${id}`;
       }
 
-      cloudFunction.labels = { "deployment-scheduled": "true" };
+      cloudFunction.labels = {
+        ...cloudFunction.labels,
+        "deployment-scheduled": "true",
+      };
     }
 
     want.cloudFunctions.push(cloudFunction);

diff --git a/src/deploy/functions/parseRuntimeAndValidateSDK.ts b/src/deploy/functions/parseRuntimeAndValidateSDK.ts
@@ -19,7 +19,7 @@ const MESSAGE_FRIENDLY_RUNTIMES: Record<backend.Runtime | DeprecatedRuntime, str
   nodejs8: "Node.js 8 (Deprecated)",
   nodejs10: "Node.js 10",
   nodejs12: "Node.js 12",
-  nodejs14: "Node.js 14 (Beta)",
+  nodejs14: "Node.js 14",
 };
 
 const DEPRECATED_RUTNIMES = ["nodejs6", "nodejs8"];

diff --git a/src/test/deploy/functions/discovery/jsexports/parseTriggers.spec.ts b/src/test/deploy/functions/discovery/jsexports/parseTriggers.spec.ts
@@ -126,6 +126,9 @@ describe("addResourcesToBackend", () => {
       vpcConnector: "projects/project/locations/region/connectors/connector",
       ingressSettings: "ALLOW_ALL",
       timeout: "60s",
+      labels: {
+        test: "testing",
+      },
     };
 
     const result = backend.empty();
@@ -146,6 +149,9 @@ describe("addResourcesToBackend", () => {
           vpcConnector: "projects/project/locations/region/connectors/connector",
           ingressSettings: "ALLOW_ALL",
           timeout: "60s",
+          labels: {
+            test: "testing",
+          },
         },
       ],
     };
@@ -260,6 +266,9 @@ describe("addResourcesToBackend", () => {
       httpsTrigger: {},
       regions: ["us-central1", "europe-west1"],
       schedule,
+      labels: {
+        test: "testing",
+      },
     };
 
     const result = backend.empty();
@@ -277,6 +286,7 @@ describe("addResourcesToBackend", () => {
       },
       labels: {
         "deployment-scheduled": "true",
+        test: "testing",
       },
       region: "us-central1",
     };
@@ -288,6 +298,7 @@ describe("addResourcesToBackend", () => {
       },
       labels: {
         "deployment-scheduled": "true",
+        test: "testing",
       },
     };
     const expected: backend.Backend = {