CL-2062 | +Harshi | Fix skip environment variables option with --variable-type flag

Author: SakshiKoli-CS

src/adapters/base-class.test.ts

@@ -189,6 +189,45 @@ describe('BaseClass', () => {
       expect(printAllVariablesMock).toHaveBeenCalled();
       expect(baseClass.envVariables).toEqual(expectedEnv);
     });
+
+    it('should handle variableType passed as string from command line flag', async () => {
+      baseClass = new BaseClass({
+        log: logMock,
+        exit: exitMock,
+        config: {
+          variableType: 'Skip adding environment variables',
+          variablePreparationTypeOptions: config.variablePreparationTypeOptions,
+        },
+      } as any);
+
+      await baseClass.handleEnvImportFlow();
+
+      expect(baseClass.envVariables).toEqual([]);
+      expect(logMock).toHaveBeenCalledWith('Skipped adding environment variables.', 'info');
+      expect(exitMock).not.toHaveBeenCalled();
+    });
+
+    it('should handle variableType string and not trigger "cannot be combined" error', async () => {
+      baseClass = new BaseClass({
+        log: logMock,
+        exit: exitMock,
+        config: {
+          variableType: 'Import variables from a stack',
+          variablePreparationTypeOptions: config.variablePreparationTypeOptions,
+        },
+      } as any);
+
+      const importEnvFromStackMock = jest.spyOn(baseClass, 'importEnvFromStack').mockResolvedValueOnce();
+
+      await baseClass.handleEnvImportFlow();
+
+      expect(importEnvFromStackMock).toHaveBeenCalled();
+      expect(exitMock).not.toHaveBeenCalled();
+      expect(logMock).not.toHaveBeenCalledWith(
+        expect.stringContaining("cannot be combined"),
+        'error',
+      );
+    });
   });
 
   describe('importVariableFromLocalConfig', () => {

src/adapters/base-class.ts

@@ -504,7 +504,7 @@ export default class BaseClass {
    * @memberof BaseClass
    */
   async handleEnvImportFlow(): Promise<void> {
-    const variablePreparationType =
+    let variablePreparationType: string | string[] =
       this.config.variableType ||
       (await ux.inquire({
         type: 'checkbox',
@@ -514,6 +514,10 @@ export default class BaseClass {
         message: 'Import variables from a stack and/or manually add custom variables to the list',
       }));
 
+    if (typeof variablePreparationType === 'string') {
+      variablePreparationType = [variablePreparationType];
+    }
+
     if (variablePreparationType.length === 0) {
       this.log('Please select at least one option by pressing <space>, then press <enter> to proceed.', 'error');
       this.exit(1);