RM-35685: Fixed circular imports of calling config in tics-cli and tics-cli in config

Author: janssen-tiobe

dist/index.js

@@ -1039,7 +1039,7 @@ const github_1 = __nccwpck_require__(54406);
 exports.actionConfig = new action_1.ActionConfiguration();
 exports.githubConfig = new github_1.GithubConfig();
 exports.ticsConfig = new tics_1.TicsConfiguration();
-exports.ticsCli = new tics_cli_1.TicsCli(exports.ticsConfig.mode);
+exports.ticsCli = new tics_cli_1.TicsCli(exports.ticsConfig.mode, exports.githubConfig.reponame);
 
 
 /***/ }),
@@ -1194,7 +1194,6 @@ exports.CliOptions = exports.TicsCli = void 0;
 const core_1 = __nccwpck_require__(37484);
 const tics_1 = __nccwpck_require__(5232);
 const logger_1 = __nccwpck_require__(66113);
-const config_1 = __nccwpck_require__(34151);
 class TicsCli {
     project;
     branchname;
@@ -1207,8 +1206,8 @@ class TicsCli {
     recalc;
     tmpdir;
     additionalFlags;
-    constructor(mode) {
-        this.project = this.getProject((0, core_1.getInput)('project'), mode);
+    constructor(mode, repoName) {
+        this.project = this.getProject((0, core_1.getInput)('project'), mode, repoName);
         this.branchname = (0, core_1.getInput)('branchname');
         this.branchdir = (0, core_1.getInput)('branchdir');
         this.cdtoken = (0, core_1.getInput)('cdtoken');
@@ -1228,12 +1227,12 @@ class TicsCli {
             this.branchdir = process.env.GITHUB_WORKSPACE;
         }
     }
-    getProject(input, mode) {
+    getProject(input, mode, repoName) {
         // validate project
         if (mode === tics_1.Mode.QSERVER) {
             if (input === 'auto') {
-                logger_1.logger.info(`Parameter 'project' is not set, using the repository name (${config_1.githubConfig.reponame}) instead.`);
-                return config_1.githubConfig.reponame;
+                logger_1.logger.info(`Parameter 'project' is not set, using the repository name (${repoName}) instead.`);
+                return repoName;
             }
         }
         return input;

src/configuration/config.ts

@@ -7,4 +7,4 @@ export const actionConfig = new ActionConfiguration();
 export const githubConfig = new GithubConfig();
 
 export const ticsConfig = new TicsConfiguration();
-export const ticsCli = new TicsCli(ticsConfig.mode);
+export const ticsCli = new TicsCli(ticsConfig.mode, githubConfig.reponame);

src/configuration/tics-cli.ts

@@ -3,7 +3,6 @@ import { getInput } from '@actions/core';
 import { CliOption } from './interfaces';
 import { Mode } from './tics';
 import { logger } from '../helper/logger';
-import { githubConfig } from './config';
 
 export class TicsCli {
   readonly project: string;
@@ -18,8 +17,8 @@ export class TicsCli {
   readonly tmpdir: string;
   readonly additionalFlags: string;
 
-  constructor(mode: Mode) {
-    this.project = this.getProject(getInput('project'), mode);
+  constructor(mode: Mode, repoName: string) {
+    this.project = this.getProject(getInput('project'), mode, repoName);
     this.branchname = getInput('branchname');
     this.branchdir = getInput('branchdir');
     this.cdtoken = getInput('cdtoken');
@@ -42,12 +41,12 @@ export class TicsCli {
     }
   }
 
-  private getProject(input: string, mode: Mode): string {
+  private getProject(input: string, mode: Mode, repoName: string): string {
     // validate project
     if (mode === Mode.QSERVER) {
       if (input === 'auto') {
-        logger.info(`Parameter 'project' is not set, using the repository name (${githubConfig.reponame}) instead.`);
-        return githubConfig.reponame;
+        logger.info(`Parameter 'project' is not set, using the repository name (${repoName}) instead.`);
+        return repoName;
       }
     }
     return input;

test/unit/configuration/tics-cli.test.ts

@@ -46,8 +46,8 @@ describe('cli Configuration', () => {
       project: 'auto'
     };
 
-    const cliClient = new TicsCli(Mode.CLIENT);
-    const cliDiagnostic = new TicsCli(Mode.DIAGNOSTIC);
+    const cliClient = new TicsCli(Mode.CLIENT, 'repoName');
+    const cliDiagnostic = new TicsCli(Mode.DIAGNOSTIC, 'repoName');
 
     expect(cliClient).toMatchObject({ ...expectCli, project: 'auto', calc: 'GATE' });
     expect(cliDiagnostic).toMatchObject({ ...expectCli, project: 'auto' });
@@ -58,8 +58,8 @@ describe('cli Configuration', () => {
       project: 'project'
     };
 
-    const cliClient = new TicsCli(Mode.CLIENT);
-    const cliDiagnostic = new TicsCli(Mode.DIAGNOSTIC);
+    const cliClient = new TicsCli(Mode.CLIENT, 'repoName');
+    const cliDiagnostic = new TicsCli(Mode.DIAGNOSTIC, 'repoName');
 
     expect(cliClient).toMatchObject({ ...expectCli, project: 'project', calc: 'GATE' });
     expect(cliDiagnostic).toMatchObject({ ...expectCli, project: 'project' });
@@ -71,21 +71,32 @@ describe('cli Configuration', () => {
       branchdir: 'dir'
     };
 
-    const cliServer = new TicsCli(Mode.QSERVER);
+    const cliServer = new TicsCli(Mode.QSERVER, 'repoName');
 
     expect(cliServer).toMatchObject({ ...expectCli, branchdir: 'dir', project: 'project' });
   });
 
-  it('should throw error if mode is qserver, project is auto and GITHUB_WORKSPACE is not available', () => {
+  it('should use repository name when mode is qserver and project is auto', () => {
     values = {
-      project: 'auto'
+      project: 'auto',
+      branchdir: 'dir'
     };
 
+    const cliServer = new TicsCli(Mode.QSERVER, 'repoName');
+
+    expect(cliServer).toMatchObject({ ...expectCli, branchdir: 'dir', project: 'repoName' });
+  });
+
+  it('should throw error if mode is qserver, branchdir is not given and GITHUB_WORKSPACE is not available', () => {
     const GITHUB_WORKSPACE = process.env.GITHUB_WORKSPACE;
     delete process.env.GITHUB_WORKSPACE;
+    values = {
+      branchdir: ''
+    };
+
     let error: any;
     try {
-      new TicsCli(Mode.QSERVER);
+      new TicsCli(Mode.QSERVER, 'repoName');
     } catch (err) {
       error = err;
     }
@@ -100,7 +111,7 @@ describe('cli Configuration', () => {
       project: 'project'
     };
     process.env.GITHUB_WORKSPACE = '/workspace/project';
-    const cliServer = new TicsCli(Mode.QSERVER);
+    const cliServer = new TicsCli(Mode.QSERVER, 'repoName');
 
     expect(cliServer).toMatchObject({ project: 'project', branchdir: '/workspace/project' });
   });
@@ -113,7 +124,7 @@ describe('cli Configuration', () => {
 
     let error: any;
     try {
-      new TicsCli(Mode.QSERVER);
+      new TicsCli(Mode.QSERVER, 'repoName');
     } catch (err) {
       error = err;
     }
@@ -137,7 +148,7 @@ describe('cli Configuration', () => {
       additionalFlags: '-log 9'
     };
 
-    const cliServer = new TicsCli(Mode.QSERVER);
+    const cliServer = new TicsCli(Mode.QSERVER, 'repoName');
 
     expect(cliServer).toMatchObject({
       project: 'project',
@@ -173,7 +184,7 @@ describe('cli Configuration', () => {
       additionalFlags: '-log 9'
     };
 
-    const cliClient = new TicsCli(Mode.CLIENT);
+    const cliClient = new TicsCli(Mode.CLIENT, 'repoName');
 
     expect(cliClient).toMatchObject({
       project: 'project',
@@ -208,7 +219,7 @@ describe('cli Configuration', () => {
       additionalFlags: '-log 9'
     };
 
-    const cliDiagnostic = new TicsCli(Mode.DIAGNOSTIC);
+    const cliDiagnostic = new TicsCli(Mode.DIAGNOSTIC, 'repoName');
 
     expect(cliDiagnostic).toMatchObject({
       project: 'project',