Modifies updateService related to functions deployment

CHANGELOG.md

@@ -0,0 +1 @@
+- Fixes issue with updateService in runv2.ts (#9918)

src/gcp/runv2.spec.ts

@@ -98,13 +98,13 @@
         httpsTrigger: {},
         environmentVariables: { FOO: "bar" },
       };
       const expectedServiceInput = JSON.parse(
         JSON.stringify({
           ...BASE_RUN_SERVICE,
           name: `projects/${PROJECT_ID}/locations/${LOCATION}/services/${FUNCTION_ID.toLowerCase()}`,
         }),
       );
       expectedServiceInput.template.containers[0].env.unshift({ name: "FOO", value: "bar" });
 
       expect(runv2.serviceFromEndpoint(endpoint, IMAGE_URI)).to.deep.equal(expectedServiceInput);
     });
@@ -117,13 +117,13 @@
           { key: "MY_SECRET", secret: "secret-name", projectId: PROJECT_ID, version: "1" },
         ],
       };
       const expectedServiceInput = JSON.parse(
         JSON.stringify({
           ...BASE_RUN_SERVICE,
           name: `projects/${PROJECT_ID}/locations/${LOCATION}/services/${FUNCTION_ID.toLowerCase()}`,
         }),
       );
       expectedServiceInput.template.containers[0].env.unshift({
         name: "MY_SECRET",
         valueSource: { secretKeyRef: { secret: "secret-name", version: "1" } },
       });
@@ -137,13 +137,13 @@
         minInstances: 1,
         maxInstances: 10,
       };
       const expectedServiceInput = JSON.parse(
         JSON.stringify({
           ...BASE_RUN_SERVICE,
           name: `projects/${PROJECT_ID}/locations/${LOCATION}/services/${FUNCTION_ID.toLowerCase()}`,
         }),
       );
       expectedServiceInput.scaling = {
         minInstanceCount: 1,
         maxInstanceCount: 10,
       };
@@ -157,13 +157,13 @@
         httpsTrigger: {},
         concurrency: 50,
       };
       const expectedServiceInput = JSON.parse(
         JSON.stringify({
           ...BASE_RUN_SERVICE,
           name: `projects/${PROJECT_ID}/locations/${LOCATION}/services/${FUNCTION_ID.toLowerCase()}`,
         }),
       );
       expectedServiceInput.template.maxInstanceRequestConcurrency = 50;
 
       expect(runv2.serviceFromEndpoint(endpoint, IMAGE_URI)).to.deep.equal(expectedServiceInput);
     });
@@ -451,7 +451,7 @@
         entryPoint: SERVICE_ID, // No FUNCTION_TARGET_ANNOTATION
         availableMemoryMb: 128,
         cpu: 0.5,
-        eventTrigger: { eventType: "unknown", retry: false },
+        httpsTrigger: {},
         labels: {},
         environmentVariables: {},
         secretEnvironmentVariables: [],

src/gcp/runv2.ts

@@ -196,7 +196,7 @@ export async function updateService(service: Omit<Service, ServiceOutputFields>)
   );
   // Always update revision name to ensure null generates a new unique revision name.
   fieldMask.push("template.revision");
-  const res = await client.post<Omit<Service, ServiceOutputFields>, LongRunningOperation<Service>>(
+  const res = await client.patch<Omit<Service, ServiceOutputFields>, LongRunningOperation<Service>>(
     service.name,
     service,
     {
@@ -619,7 +619,8 @@ export function endpointFromService(service: Omit<Service, ServiceOutputFields>)
         ? "ALLOW_INTERNAL_AND_GCLB"
         : "ALLOW_ALL") as backend.IngressSettings,
     // TODO: Figure out how to encode all trigger types to the underlying Run service that is compatible with both V2 functions and "direct to run" functions
-    ...(service.annotations?.[TRIGGER_TYPE_ANNOTATION] === "HTTP_TRIGGER"
+    ...(!service.annotations?.[TRIGGER_TYPE_ANNOTATION] ||
+    service.annotations?.[TRIGGER_TYPE_ANNOTATION] === "HTTP_TRIGGER"
       ? { httpsTrigger: {} }
       : {
           eventTrigger: {