fix: update merging of services (#30)

* fix: update merge

* lint

Author: averikitsch

src/service.ts

@@ -15,7 +15,7 @@
  */
 
 import { run_v1 } from 'googleapis';
-import { get } from 'lodash';
+import { get, merge } from 'lodash';
 import fs from 'fs';
 import YAML from 'yaml';
 
@@ -61,7 +61,7 @@ export function parseEnvVars(envVarInput: string): run_v1.Schema$EnvVar[] {
  * @returns Service.
  */
 export class Service {
-  readonly request: run_v1.Schema$Service;
+  request: run_v1.Schema$Service;
   readonly name: string;
 
   constructor(opts: ServiceOptions) {
@@ -140,58 +140,35 @@ export class Service {
     const name = get(this.request, 'spec.template.metadata.name');
     const previousName = get(prevService, 'spec.template.metadata.name');
 
-    // Merge Revision metadata
-    const labels = {
-      ...prevService.spec?.template?.metadata?.labels,
-      ...this.request.spec?.template?.metadata?.labels,
-    };
-    const annotations = {
-      ...prevService.spec?.template?.metadata?.annotations,
-      ...this.request.spec?.template?.metadata?.annotations,
-    };
-    this.request.spec!.template!.metadata = {
-      annotations,
-      labels,
-    };
+    // Deep Merge Service
+    const mergedServices = merge(prevService, this.request);
 
     // Force update with Revision name change
-    this.request.spec!.template!.metadata!.name = this.generateRevisionName(
+    mergedServices.spec!.template!.metadata!.name = this.generateRevisionName(
       name,
       previousName,
     );
 
     // Merge Container spec
-    const prevContainer = prevService.spec!.template!.spec!.containers![0];
-    const currentContainer = this.request.spec!.template!.spec!.containers![0];
-    const container = { ...prevContainer, ...currentContainer };
-
-    // Merge Revision spec
-    const spec = {
-      ...prevService.spec?.template?.spec,
-      ...this.request.spec!.template!.spec,
-    };
-    if (!currentContainer.command) {
-      // Remove entrypoint cmd and arguments if not specified
-      delete container.command;
-      delete container.args;
-    }
+    const prevEnvVars = prevService.spec!.template!.spec!.containers![0].env;
+    const currentEnvVars = this.request.spec!.template!.spec!.containers![0]
+      .env;
 
     // Merge Env vars
     let env: run_v1.Schema$EnvVar[] = [];
-    if (currentContainer.env) {
-      env = currentContainer.env.map(
-        (envVar) => envVar as run_v1.Schema$EnvVar,
-      );
+    if (currentEnvVars) {
+      env = currentEnvVars.map((envVar) => envVar as run_v1.Schema$EnvVar);
     }
     const keys = env?.map((envVar) => envVar.name);
-    prevContainer.env?.forEach((envVar) => {
+    prevEnvVars?.forEach((envVar) => {
       if (!keys.includes(envVar.name)) {
+        // Add old env vars without duplicating
         return env.push(envVar);
       }
     });
-    container.env = env;
-    spec.containers = [container];
-    this.request.spec!.template!.spec = spec;
+    // Set Env vars
+    mergedServices.spec!.template!.spec!.containers![0].env = env;
+    this.request = mergedServices;
   }
 
   private generateRevisionName(name?: string, prevName?: string): string {

tests/e2e.test.ts

@@ -22,7 +22,7 @@ import * as _ from 'lodash';
 import 'mocha';
 import { run_v1 } from 'googleapis';
 
-describe('E2E tests', function() {
+describe('E2E tests', function () {
   const {
     PARAMS,
     ANNOTATIONS,
@@ -36,7 +36,7 @@ describe('E2E tests', function() {
   let URL: string;
   let client: CloudRun;
   let service: run_v1.Schema$Service;
-  before(async function() {
+  before(async function () {
     if (process.env.URL) {
       URL = process.env.URL;
     } else {
@@ -50,7 +50,7 @@ describe('E2E tests', function() {
     }
   });
 
-  it('can make a request', async function() {
+  it('can make a request', async function () {
     // Requires ADC to be set
     const auth = new GoogleAuth();
     const client = await auth.getIdTokenClient(URL);
@@ -59,7 +59,7 @@ describe('E2E tests', function() {
     expect(response.data).to.include('Congrat');
   });
 
-  it('has the correct env vars', function() {
+  it('has the correct env vars', function () {
     if (ENV && service) {
       const expected = parseEnvVars(ENV);
       const containers = _.get(service, 'spec.template.spec.containers');
@@ -74,7 +74,7 @@ describe('E2E tests', function() {
     }
   });
 
-  it('has the correct params', function() {
+  it('has the correct params', function () {
     if (PARAMS && service) {
       const expected = JSON.parse(PARAMS);
       const actual = _.get(service, 'spec.template.spec');
@@ -97,7 +97,7 @@ describe('E2E tests', function() {
     }
   });
 
-  it('has the correct annotations', function() {
+  it('has the correct annotations', function () {
     if (ANNOTATIONS && service) {
       const expected = JSON.parse(ANNOTATIONS);
       const actual = _.get(service, 'spec.template.metadata.annotations');
@@ -111,7 +111,7 @@ describe('E2E tests', function() {
     }
   });
 
-  it('has the correct labels', function() {
+  it('has the correct labels', function () {
     if (LABELS && service) {
       const expected = JSON.parse(LABELS);
       const actual = _.get(service, 'spec.template.metadata.labels');
@@ -125,15 +125,17 @@ describe('E2E tests', function() {
     }
   });
 
-  it('has the correct revision count', async function() {
+  it('has the correct revision count', async function () {
     if (COUNT && SERVICE) {
       const revisions = await client.listRevisions();
-      const filtered = revisions.filter((name) => name.includes(SERVICE.substring(0, 52)));
+      const filtered = revisions.filter((name) =>
+        name.includes(SERVICE.substring(0, 52)),
+      );
       expect(filtered.length).to.equal(parseInt(COUNT));
     }
   });
 
-  it('has the correct revision name', function() {
+  it('has the correct revision name', function () {
     if (REVISION && service) {
       const actual = _.get(service, 'spec.template.metadata.name');
       expect(REVISION).to.equal(actual);