From 58067577c35427ea6ddbcc2686db135f83a48002 Mon Sep 17 00:00:00 2001 From: Tanner Barlow Date: Tue, 3 Sep 2019 15:56:48 -0700 Subject: [PATCH] fix: Combine rollback log statement into one string (#290) Strings were being logged out of order at random for some reason. Seemed cleaner anyway to just combine them into one string and adjusted tests. --- src/services/rollbackService.test.ts | 7 ++----- src/services/rollbackService.ts | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/services/rollbackService.test.ts b/src/services/rollbackService.test.ts index 502e03d7..f532b229 100644 --- a/src/services/rollbackService.test.ts +++ b/src/services/rollbackService.test.ts @@ -80,11 +80,8 @@ describe("Rollback Service", () => { const options = {} as any; const service = createService(sls, options); await service.rollback(); - expect(sls.cli.log).lastCalledWith( - deploymentString, - undefined, - undefined - ); + const logCalls: any[][] = (sls.cli.log as any).mock.calls; + expect(logCalls[logCalls.length - 1][0].endsWith(deploymentString)).toBe(true); }); it("should return early with invalid timestamp", async () => { diff --git a/src/services/rollbackService.ts b/src/services/rollbackService.ts index dd9c911a..540086dc 100644 --- a/src/services/rollbackService.ts +++ b/src/services/rollbackService.ts @@ -111,10 +111,10 @@ export class RollbackService extends BaseService { private async getDeployment(): Promise { let timestamp = Utils.get(this.options, "timestamp"); if (!timestamp) { - this.log("Need to specify a timestamp for rollback."); - this.log("Example usage:\n\nsls rollback -t 1562014362"); - this.log(await this.resourceService.listDeployments()); - return null; + this.log("Need to specify a timestamp for rollback.\n\n" + + "Example usage:\n\nsls rollback -t 1562014362\n\n" + + await this.resourceService.listDeployments()); + return; } const deployments = await this.getArmDeploymentsByTimestamp(); const deployment = deployments.get(timestamp);