IE-186: Add PATCH method support for redeploying functions and improv… (#263)

* IE-186: Add PATCH method support for redeploying functions and improve deployment logic

* fixed buggy test

---------

Co-authored-by: cbrutscher <[email protected]>

Author: chrbrt

package.json

@@ -1,7 +1,7 @@
 {
   "name": "liveperson-functions-cli",
   "description": "LivePerson Functions CLI",
-  "version": "2.0.5-beta",
+  "version": "2.0.6-beta",
   "author": {
     "name": "LivePersonInc",
     "email": "[email protected]"

src/service/faas.service.ts

@@ -18,7 +18,7 @@ import {
 } from '../types/IFunction';
 import { LPSchedule, LPScheduleCreateParams } from '../types/ISchedule';
 
-export type HttpMethods = 'POST' | 'GET' | 'DELETE' | 'PUT';
+export type HttpMethods = 'POST' | 'GET' | 'DELETE' | 'PUT' | 'PATCH';
 
 export interface IPayload {
   headers: string[];
@@ -208,6 +208,20 @@ export class FaasService implements IFaaSService {
     }
   }
 
+  public async redeploy(uuid: string): Promise<IDeploymentResponse> {
+    const urlPart = `/deployments/${uuid}`;
+    try {
+      const response = await this.doFetch({ urlPart, method: 'PATCH' });
+
+      return response;
+    } catch (error) {
+      return {
+        message: error.errorMsg,
+        uuid,
+      };
+    }
+  }
+
   public async getLambdasByNames(lambdaNames: string[]): Promise<LPFunction[]> {
     const allFnMetas = await this.getAllFunctionMetas();
     const existingFunctions = allFnMetas.filter(({ name }) =>
@@ -446,7 +460,7 @@ export class FaasService implements IFaaSService {
 
   public async getFunctionByUuid(uuid: string): Promise<IFunction> {
     const urlPart = `/functions/${uuid}`;
-    const [foundLambda] = await this.doFetch({ urlPart, method: 'GET' });
+    const foundLambda = await this.doFetch({ urlPart, method: 'GET' });
     return foundLambda;
   }
 

src/view/deploy.view.ts

@@ -84,13 +84,17 @@ export class DeployView {
     } else {
       this.log.print('\nDeploying following functions:\n');
     }
-
     confirmedFunctionsToDeploy.forEach((entry: IFunction) => {
       this.tasklist.addTask({
         title: `Deploying ${entry.name}`,
         task: async (_, task) => {
           const faasService = await factory.get();
-          const response = await faasService.deploy(entry.uuid);
+          let response;
+          if (entry.state === 'Modified') {
+            response = await faasService.redeploy(entry.uuid);
+          } else {
+            response = await faasService.deploy(entry.uuid);
+          }
 
           if (response.uuid) {
             return task.skip(`${response.message} (${entry.uuid})`);
@@ -117,37 +121,42 @@ export class DeployView {
   private async waitForDeployment(
     faasService: any,
     uuid: string,
-    timeoutMs = 2000000,
-    intervalMs = 3000,
-  ): Promise<void> {
-    const startTime = Date.now();
+    timeoutMs = 2_000_000,
+    intervalMs = 3_000,
+  ): Promise<boolean> {
+    const start = Date.now();
 
-    return new Promise<void>((resolve, reject) => {
-      const poll = async () => {
+    return new Promise<boolean>((resolve, reject) => {
+      const poll = async (): Promise<boolean> => {
         try {
-          const isDeployed = await this.checkIfLambdaIsDeployed(
+          const deployed = await this.checkIfLambdaIsDeployed(
             faasService,
             uuid,
           );
 
-          if (isDeployed) {
-            resolve();
-            return;
+          if (deployed) {
+            resolve(true);
+            return true;
           }
 
-          const elapsed = Date.now() - startTime;
-          if (elapsed >= timeoutMs) {
+          if (Date.now() - start >= timeoutMs) {
             reject(
               new Error(
                 `Deployment timeout after ${timeoutMs}ms for function ${uuid}`,
               ),
             );
-            return;
+            return false;
           }
 
           setTimeout(poll, intervalMs);
-        } catch (error) {
-          reject(error);
+          return false;
+        } catch (err) {
+          reject(
+            new Error(
+              `Error while checking deployment for ${uuid}: ${err.message}`,
+            ),
+          );
+          return false;
         }
       };
 
@@ -165,11 +174,11 @@ export class DeployView {
   }
 
   private preparePromptMessage(lambda: any) {
-    const message = `Do you want to approve and deploy?
-
+    const message = `Do you want to approve and (re)deploy?
     AccountId:              ${this.chalk.green(lambda.accountId)}
     Description:            ${lambda.description}
     UUID:                   ${lambda.uuid}
+    UUID:                   ${lambda.state}
     Event:                  ${lambda.event || 'No Event'}
     Last modified by:       ${lambda.updatedBy}
     Last modified at:       ${formatDate(lambda.updatedAt)}

test/service/faas.service.test.ts

@@ -163,7 +163,7 @@ describe('faas service', () => {
     const csdsClient = new CsdsClient();
     csdsClient.getUri = jest.fn().mockReturnValue('faasUI');
     const gotDefault = jest.fn(() => ({
-      body: [mock.mockFunction1],
+      body: mock.mockFunction1,
     })) as any;
     const faasService = new FaasService({ gotDefault, csdsClient });
     const response = await faasService.getFunctionByUuid('123-123-123');