@eui/tools 6.2.9 → 6.2.11

package/.version.properties

@@ -1 +1 @@
-6.2.9
+6.2.11

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.2.11 (2022-11-11)
+
+##### Chores
+
+* **other:**
+  * adapted init parameters for CI virtual remotes build - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([b28cf25b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b28cf25bb9302f6161de724e1110bc216deba5ae))
+
+* * *
+* * *
+## 6.2.10 (2022-11-11)
+
+##### Chores
+
+* **other:**
+  * adapted init parameters for CI virtual remotes build - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([5a5e28de](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5a5e28de787650552cd282d722f2a55424ff1a63))
+
+* * *
+* * *
 ## 6.2.9 (2022-11-11)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.2.9",
+    "version": "6.2.11",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/csdr/config/init.js

@@ -17,8 +17,6 @@ module.exports.run = (args) => {
   return Promise.resolve()
     .then(() => {
       tools.logInfo('Updating local configuration')
-      tools.logInfo('Current configuration: ');
-      console.log(args);
 
       return getInputPackages(args.project, args.pkg, args.team, args.prjOnly, args.containerOnly);
     })

package/scripts/csdr/init/init.js

@@ -8,7 +8,7 @@ const configUtils = require('../config/config-utils');
 // Getting arguments if they are provided for the CI/CD pipeline
 const {
   project, team, pkg, branch, configOnly, skipClone, skipInstall, reset, pkgOnly, prjOnly,
-  build, containerOnly, skipAppContainers, remote, euiVersion, remoteOnly
+  build, containerOnly, skipAppContainers, remote, euiVersion, remoteOnly, remoteBuild, virtual
 } = tools.getArgs();
 
 
@@ -19,6 +19,8 @@ module.exports.init = () => {
     team: team || 'all',
     pkg: pkg || null,
     remote: remote || null,
+    remoteBuild: remoteBuild || false,
+    virtual: virtual || false,
     euiVersion: euiVersion || null,
     branch: branch || 'develop',
     configOnly: configOnly || false,
@@ -37,15 +39,34 @@ module.exports.init = () => {
     initialResponse.branch = 'develop';
   }
 
+  // converting inputs
+  if (initialResponse.branch && typeof (initialResponse.branch) === 'boolean') {
+    initialResponse.branch = 'develop';
+  }
+  if (initialResponse.remoteBuild && typeof (initialResponse.remoteBuild) === 'boolean') {
+    initialResponse.remoteBuild = false;
+  }
+  if (initialResponse.virtual && typeof (initialResponse.virtual) === 'boolean') {
+    initialResponse.virtual = false;
+  }
+  if (initialResponse.euiVersion && typeof (initialResponse.euiVersion) === 'boolean') {
+    initialResponse.euiVersion = null;
+  }
+
   // setting project to null if forced to NONE
   if (initialResponse.project === 'NONE') {
     initialResponse.project = null;
   }
 
+  // swapping to remote build if virtual remote is pass to default gitlab call
+  if (initialResponse.remoteBuild && initialResponse.pkg && initialResponse.virtual) {
+    initialResponse.remote = initialResponse.pkg;
+    initialResponse.pkg = null;
+  }
+
   // Storing the response for propagation
   var finalResponse;
 
-
   return Promise.resolve()
     .then(() => {
 
@@ -62,6 +83,9 @@ module.exports.init = () => {
     // merge with response found from prompts
     .then((response) => {
       finalResponse = { ...initialResponse, ...response };
+
+      tools.logInfo('Init configuration :');
+      console.log(finalResponse);
     })
 
     // Initializing .euirc.json local file - the core of CSDR operations
@@ -84,21 +108,21 @@ module.exports.init = () => {
 
     // Initializing .meta based on .euirc.json for local respoisitories cloning
     .then(() => {
-      if (!remote) {
+      if (!finalResponse.remote) {
         return initUtils.meta.init();
       }
     })
 
     // Cloning repositories based on the .meta file generated
     .then(() => {
-      if (!skipClone && !remote) {
+      if (!skipClone && !finalResponse.remote) {
         return initUtils.repos.init(finalResponse);
       }
     })
 
     // Importing packages and generating definitions
     .then(() => {
-      if (!remote) {
+      if (!finalResponse.remote) {
         return initUtils.packages.importPackages(finalResponse);
       }
     })
@@ -114,10 +138,9 @@ module.exports.init = () => {
     .then(() => {
       if (finalResponse.remote) {
         if (finalResponse.euiVersion) {
-          return initUtils.remotes.generateVirtualRemote(remote, euiVersion);
+          return initUtils.remotes.generateVirtualRemote(finalResponse.remote, finalResponse.euiVersion);
         } else {
-          tools.logError('When a remote is initialized, an "euiVersion" parameter must be specified');
-          process.exit(1);
+          throw new Error('When a remote is initialized, an "euiVersion" parameter must be specified');
         }
       }
     })
@@ -140,9 +163,9 @@ module.exports.init = () => {
       if (!build && !skipInstall) {
         if (finalResponse.pkgOnly || finalResponse.remoteOnly) {
           if (finalResponse.remote) {
-            return installUtils.localDev.installRemote(remote);
+            return installUtils.localDev.installRemote(finalResponse.remote);
           } else {
-            return installUtils.localDev.installPackage(pkg);
+            return installUtils.localDev.installPackage(finalResponse.pkg);
           }
         } else {
           return installUtils.localDev.install();
@@ -177,7 +200,7 @@ module.exports.init = () => {
 
     // Attaching external mock repo for project
     .then(() => {
-      if (finalResponse.project && !build && !prjOnly) {
+      if (finalResponse.project && !build && !finalResponse.prjOnly) {
         return initUtils.projects.importExternalMock();
       }
     })