fix: fix behaviour of redeploy-latest and redeploy-last-upload flag for existing project to not show prompt

Chhavi-Mandowara · dhruvparekh12 · commit 220a669e4396 · 2025-03-03T17:52:11.000+05:30
diff --git a/src/adapters/file-upload.ts b/src/adapters/file-upload.ts
@@ -26,35 +26,36 @@ export default class FileUpload extends BaseClass {
    */
   async run(): Promise<void> {
     if (this.config.isExistingProject) {
-      await this.initApolloClient();
-      const uploadLastFile =
-        this.config['redeploy-last-upload'] ||
-        (await cliux.inquire({
-          type: 'confirm',
-          default: false,
-          name: 'uploadLastFile',
-          message: 'Redeploy with last file upload?',
-        }));
-      if (!uploadLastFile) {
-        await this.createSignedUploadUrl();
-        const { zipName, zipPath } = await this.archive();
-        await this.uploadFile(zipName, zipPath);
-      }
-
-      const { uploadUid } = this.signedUploadUrlData || {
-        uploadUid: undefined,
-      };
-      await this.createNewDeployment(true, uploadUid);
+      await this.handleExistingProject();
     } else {
-      await this.prepareForNewProjectCreation();
-      await this.createNewProject();
+      await this.handleNewProject();
     }
-
+  
     this.prepareLaunchConfig();
     await this.showLogs();
     this.showDeploymentUrl();
     this.showSuggestion();
   }
+  
+  private async handleExistingProject(): Promise<void> {
+    await this.initApolloClient();
+    
+    let redeployLatest = this.config['redeploy-latest'];
+
+    if (redeployLatest) {
+      await this.createSignedUploadUrl();
+      const { zipName, zipPath } = await this.archive();
+      await this.uploadFile(zipName, zipPath);
+    }
+
+    const { uploadUid } = this.signedUploadUrlData || { uploadUid: undefined };
+    await this.createNewDeployment(true, uploadUid);
+  }
+  
+  private async handleNewProject(): Promise<void> {
+    await this.prepareForNewProjectCreation();
+    await this.createNewProject();
+  }
 
   /**
    * @method createNewProject - Create new launch project
diff --git a/src/adapters/github.ts b/src/adapters/github.ts
@@ -21,24 +21,10 @@ export default class GitHub extends BaseClass {
    * @memberof GitHub
    */
   async run(): Promise<void> {
-    // NOTE New project creation Flow
     if (this.config.isExistingProject) {
-      await this.initApolloClient();
-      await this.createNewDeployment();
+      await this.handleExistingProject();
     } else {
-      // NOTE Existing project flow
-      // NOTE Step 1: Check is Github connected
-      if (await this.checkGitHubConnected()) {
-        // NOTE Step 2: check is the git remote available in the user's repo list
-        if (await this.checkGitRemoteAvailableAndValid()) {
-          if (await this.checkUserGitHubAccess()) {
-            // NOTE Step 3: check is the user has proper git access
-            await this.prepareForNewProjectCreation();
-          }
-        }
-      }
-
-      await this.createNewProject();
+      await this.handleNewProject();
     }
 
     this.prepareLaunchConfig();
@@ -47,6 +33,34 @@ export default class GitHub extends BaseClass {
     this.showSuggestion();
   }
 
+  private async handleExistingProject(): Promise<void> {
+    await this.initApolloClient();
+    const redeployLastUpload = this.config['redeploy-last-upload'];
+
+    if (redeployLastUpload) {
+      this.log('redeploy-last-upload flag is not supported for Github Project.', 'error');
+      this.exit(1);
+      return;
+    }
+
+    await this.initApolloClient();
+    await this.createNewDeployment();
+  }
+
+  private async handleNewProject(): Promise<void> {
+    // NOTE Step 1: Check is Github connected
+    if (await this.checkGitHubConnected()) {
+      // NOTE Step 2: check is the git remote available in the user's repo list
+      if (await this.checkGitRemoteAvailableAndValid()) {
+        if (await this.checkUserGitHubAccess()) {
+          // NOTE Step 3: check is the user has proper git access
+          await this.prepareForNewProjectCreation();
+        }
+      }
+    }
+    await this.createNewProject();
+  }
+
   /**
    * @method createNewProject - Create new launch project
    *
diff --git a/src/adapters/pre-check.ts b/src/adapters/pre-check.ts
@@ -47,16 +47,6 @@ export default class PreCheck extends BaseClass {
         this.log('Existing launch project identified', 'info');
 
         await this.displayPreDeploymentDetails();
-        const deployLatestCode =
-          this.config['redeploy-latest'] ||
-          (await ux.inquire({
-            type: 'confirm',
-            name: 'deployLatestSource',
-            message: 'Redeploy latest commit/code?',
-          }));
-        if (!deployLatestCode) {
-          this.exit(1);
-        }
       }
     }
   }
diff --git a/test/unit/adapters/file-upload.test.ts b/test/unit/adapters/file-upload.test.ts
@@ -7,11 +7,12 @@ import { FileUpload, BaseClass } from '../../../src/adapters';
 import { BaseCommand } from '../../../src/base-command';
 
 describe('File Upload', () => {
-  let inquireStub, prepareApiClientsStub, prepareConfigStub, getConfigStub;
+  let inquireStub, exitStub, prepareApiClientsStub, prepareConfigStub, getConfigStub;
   let adapterConstructorInputs;
 
   beforeEach(() => {
     inquireStub = stub(cliux, 'inquire');
+    exitStub = stub(BaseCommand.prototype, 'exit');
     prepareConfigStub = stub(BaseCommand.prototype, 'prepareConfig').resolves();
     prepareApiClientsStub = stub(BaseCommand.prototype, 'prepareApiClients').resolves();
     getConfigStub = stub(BaseCommand.prototype, 'getConfig').resolves();
@@ -25,6 +26,7 @@ describe('File Upload', () => {
 
   afterEach(() => {
     inquireStub.restore();
+    exitStub.restore();
     prepareConfigStub.restore();
     getConfigStub.restore();
     prepareApiClientsStub.restore();
@@ -43,9 +45,6 @@ describe('File Upload', () => {
       showDeploymentUrlStub,
       showSuggestionStub;
 
-    let adapterConstructorOptions = {
-      config: { isExistingProject: true, currentConfig: { uid: '123244', organizationUid: 'bltxxxxxxxx' } },
-    };
     beforeEach(() => {
       initApolloClientStub = stub(BaseClass.prototype, 'initApolloClient').resolves();
       createSignedUploadUrlStub = stub(FileUpload.prototype, 'createSignedUploadUrl').resolves();
@@ -75,8 +74,40 @@ describe('File Upload', () => {
       showSuggestionStub.restore();
     });
 
-    it('should run github flow', async () => {
-      new FileUpload(adapterConstructorOptions).run();
+    describe('Redeploy existing project', () => {
+      
+      it('should run file upload flow for existing project where flag passed is redeploy-latest', async () => {
+        let adapterConstructorOptions = {
+          config: { 
+            isExistingProject: true,
+            currentConfig: { uid: '123244', organizationUid: 'bltxxxxxxxx', }, 
+            'redeploy-latest': true
+          },
+        };
+        new FileUpload(adapterConstructorOptions).run();
+      });
+
+      it('should run file upload flow for existing project where flag passed is redeploy-last-upload', async () => {
+        let adapterConstructorOptions = {
+          config: { 
+            isExistingProject: true, 
+            currentConfig: { uid: '123244', organizationUid: 'bltxxxxxxxx', },
+            'redeploy-last-upload': true
+            },
+        };
+        new FileUpload(adapterConstructorOptions).run();
+      });
+    });
+
+    describe('Deploy new project', () => {
+      let adapterConstructorOptions = {
+        config: { 
+          isExistingProject: false 
+        },
+      };
+      it('should run file upload flow for new project', async () => {
+        new FileUpload(adapterConstructorOptions).run();
+      });
     });
   });
 
diff --git a/test/unit/adapters/github.test.ts b/test/unit/adapters/github.test.ts
@@ -5,6 +5,8 @@ import { cliux } from '@contentstack/cli-utilities';
 import { githubAdapterMockData } from '../mock/index';
 import { GitHub, BaseClass } from '../../../src/adapters';
 import { BaseCommand } from '../../../src/base-command';
+import { exit } from 'process';
+import fs from 'fs';
 
 describe('GitHub', () => {
   let inquireStub, prepareApiClientsStub, prepareConfigStub, getConfigStub;
@@ -41,6 +43,7 @@ describe('GitHub', () => {
       prepareLaunchConfigStub,
       showLogsStub,
       showDeploymentUrlStub,
+      exitStub,
       showSuggestionStub;
 
     beforeEach(() => {
@@ -53,11 +56,11 @@ describe('GitHub', () => {
       checkUserGitHubAccessStub = stub(GitHub.prototype, 'checkUserGitHubAccess').resolves(true);
       prepareForNewProjectCreationStub = stub(GitHub.prototype, 'prepareForNewProjectCreation').resolves();
       createNewProjectStub = stub(GitHub.prototype, 'createNewProject').resolves();
-
       prepareLaunchConfigStub = stub(BaseClass.prototype, 'prepareLaunchConfig').resolves();
       showLogsStub = stub(BaseClass.prototype, 'showLogs').resolves();
       showDeploymentUrlStub = stub(BaseClass.prototype, 'showDeploymentUrl').resolves();
       showSuggestionStub = stub(BaseClass.prototype, 'showSuggestion').resolves();
+      exitStub = stub(BaseCommand.prototype, 'exit').resolves();
     });
 
     afterEach(() => {
@@ -72,10 +75,46 @@ describe('GitHub', () => {
       showLogsStub.restore();
       showDeploymentUrlStub.restore();
       showSuggestionStub.restore();
+      exitStub.restore();
+    });
+
+    describe('Redeploy existing project', () => {
+      it('should abort github flow for existing project and flag redeploy-last-upload is passed', async () => {
+        const adapterConstructorOptions = {
+          config: { 
+            isExistingProject: true,
+            'redeploy-last-upload': true 
+          },
+        };
+        const exitStub = stub(process, 'exit');
+        const githubInstance = new GitHub(adapterConstructorOptions);
+  
+        await githubInstance.handleExistingProject();
+        
+        expect(exitStub.calledOnceWithExactly(1)).to.be.true;
+      });
+      
+      it('should run github flow for existing project and flag redeploy-latest is passed ', async () => {
+        let adapterConstructorOptions = {
+          config: { 
+            isExistingProject: true,
+            'redeploy-latest': true 
+          },
+        };
+
+        new GitHub(adapterConstructorOptions).run()
+      });
     });
 
-    it('should run github flow', async () => {
-      new GitHub(adapterConstructorInputs).run();
+    describe('Deploy new project', () => {
+      let adapterConstructorOptions = {
+        config: { 
+          isExistingProject: false 
+        },
+      };
+      it('should run file upload flow for new project', async () => {
+        new GitHub(adapterConstructorOptions).run();
+      });
     });
   });
 

Original file line number	Diff line number	Diff line change
`@@ -47,16 +47,6 @@ export default class PreCheck extends BaseClass {`
`47`	`47`	`this.log('Existing launch project identified', 'info');`
`48`	`48`
`49`	`49`	`await this.displayPreDeploymentDetails();`
`50`		`- const deployLatestCode =`
`51`		`- this.config['redeploy-latest'] \|\|`
`52`		`- (await ux.inquire({`
`53`		`- type: 'confirm',`
`54`		`- name: 'deployLatestSource',`
`55`		`- message: 'Redeploy latest commit/code?',`
`56`		`- }));`
`57`		`- if (!deployLatestCode) {`
`58`		`- this.exit(1);`
`59`		`- }`
`60`	`50`	`}`
`61`	`51`	`}`
`62`	`52`	`}`