@eui/tools 6.2.10 → 6.2.12

package/.version.properties

@@ -1 +1 @@
-6.2.10
+6.2.12

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.2.12 (2022-11-12)
+
+##### Chores
+
+* **other:**
+  * updated UI package release for virtual remotes - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([34bc113f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/34bc113fe23752d5314ef65b36b6f3a3dd3c3998))
+
+* * *
+* * *
+## 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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.2.10",
+    "version": "6.2.12",
     "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/config/packages.js

@@ -109,6 +109,7 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
   // fetch package from config
   let pkg = packages[pkgName];
 
+
   if (!pkg && !optional) {
     tools.logError(`Package ${pkgName} cannot be found in your local installation, mount it with:`);
     tools.logInfo(`npm run init -- --pkg ${pkgName} --pkgOnly`);

package/scripts/csdr/config/remotes.js

@@ -8,6 +8,7 @@ const tools = require('../../utils/tools');
 
 module.exports.getRemote = (remoteName, euiVersion) => {
 
+  // if not provided as param, we fetch them from the command line (local operations)
   if (!remoteName) {
     remoteName = tools.getArgs().root;
   }
@@ -16,6 +17,8 @@ module.exports.getRemote = (remoteName, euiVersion) => {
     euiVersion = tools.getArgs().euiVersion;
   }
 
+
+
   tools.logTitle(`Getting remote config for ${remoteName} version ${euiVersion}`);
 
   if (!euiVersion) {
@@ -59,6 +62,7 @@ module.exports.getRemote = (remoteName, euiVersion) => {
     paths: {
       root: remoteRootPath,
       dist: path.join(remoteRootPath, 'dist'),
+      publish: path.join(remoteRootPath, 'dist'), // maintain compat with core publish utils
       fromRoot: `remotes/${fullName}`,
       repoNodeModules: path.join(remoteRootPath, 'node_modules'),
     },

package/scripts/csdr/init/init.js

@@ -34,10 +34,12 @@ module.exports.init = () => {
     skipAppContainers: skipAppContainers || false
   }
 
-  // checking branch
-  if (initialResponse.branch && typeof (initialResponse.branch) === 'boolean') {
-    initialResponse.branch = 'develop';
-  }
+  // converting inputs args
+  initialResponse.branch = tools.convertStringArg(initialResponse.branch, 'develop');
+  initialResponse.euiVersion = tools.convertStringArg(initialResponse.euiVersion);
+  initialResponse.remoteBuild = tools.convertBooleanArg(initialResponse.remoteBuild);
+  initialResponse.virtual = tools.convertBooleanArg(initialResponse.virtual);
+
 
   // setting project to null if forced to NONE
   if (initialResponse.project === 'NONE') {
@@ -50,9 +52,9 @@ module.exports.init = () => {
     initialResponse.pkg = null;
   }
 
-  // Storing the response for propagation
-  var finalResponse;
 
+  // Storing the response for propagation
+  let finalResponse;
 
   return Promise.resolve()
     .then(() => {
@@ -70,12 +72,15 @@ module.exports.init = () => {
     // merge with response found from prompts
     .then((response) => {
       finalResponse = { ...initialResponse, ...response };
+
+      tools.logInfo('Configuration generated based on provided args:');
+      console.log(finalResponse);
     })
 
     // Initializing .euirc.json local file - the core of CSDR operations
     .then(() => {
       // Initialize config
-      if (!remote) {
+      if (!finalResponse.remote) {
         return configUtils.init.run(finalResponse);
       }
     })
@@ -92,21 +97,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);
       }
     })
@@ -122,7 +127,7 @@ 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 {
           throw new Error('When a remote is initialized, an "euiVersion" parameter must be specified');
         }
@@ -147,9 +152,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();
@@ -184,7 +189,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();
       }
     })

package/scripts/csdr/metadata/common.js

@@ -11,9 +11,7 @@ const configUtils = require('../config/config-utils');
 // fetching command parameters
 const { dryRun, skipClone } = tools.getArgs();
 
-// inner modules
-const innerAppHistory = require('./app-history');
-const innerAppEnvs = require('./app-envs');
+
 
 
 module.exports.cloneMetadataRepo = (noHistory = false) => {

package/scripts/csdr/metadata/package-envs.js

@@ -38,7 +38,7 @@ module.exports.storeMetadata = (pkg, newVersion, metadata, envTarget) => {
 
   return Promise.resolve()
     .then(() => {
-      tools.logTitle('Storing package environment metadata...');
+      tools.logInfo('Storing package environment metadata...');
 
       const metadataFile = path.join(DEVOPS_METADATA_PATH, pkg.devopsEnvsMetadataFile);
 
@@ -56,9 +56,8 @@ module.exports.storeMetadata = (pkg, newVersion, metadata, envTarget) => {
         dependencies: metadata
       };
 
-      if (!dryRun) {
-        tools.writeJsonFileSync(metadataFile, generatedMetadata);
-      }
+      tools.logInfo(`Writing envs metadata to ${metadataFile}`);
+      tools.writeJsonFileSync(metadataFile, generatedMetadata);
     })
 
     .then(() => {

package/scripts/csdr/metadata/package-history.js

@@ -83,9 +83,7 @@ const storeMetadata = (pkg, diffMetadata, newVersion) => {
 
       historyMetadata.versions = versions;
 
-      if (!dryRun) {
-        tools.writeJsonFileSync(historyFile, historyMetadata);
-      }
+      tools.writeJsonFileSync(historyFile, historyMetadata);
     })
 
     // storing issuesList gathered into gitlab variables for post CI processing
@@ -207,6 +205,8 @@ const getDiffBetweenBuildVersions = (pkg, fromBuildMetadata, toBuildMetadata) =>
 
 
 const getDiffByEnvTarget = (pkg, envTarget) => {
+  tools.logInfo(`Getting differences for ${pkg.name} - ${envTarget}`);
+
   return Promise.resolve()
     .then(() => {
       return innerPackage.getPackageVersionsLatest(pkg);

package/scripts/csdr/metadata/package-versions.js

@@ -9,8 +9,6 @@ const tools = require('../../utils/tools');
 const configUtils = require('../config/config-utils');
 
 
-// FETCH ARGS
-const { dryRun } = tools.getArgs();
 
 
 module.exports.getMetadata = (pkg) => {
@@ -74,9 +72,7 @@ module.exports.storeMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration, env
       generatedMetadata.versions = versions;
 
       tools.logInfo(`Write metadata on ${pkgMetadataFile}`);
-      if (!dryRun) {
-        tools.writeJsonFileSync(pkgMetadataFile, generatedMetadata);
-      }
+      tools.writeJsonFileSync(pkgMetadataFile, generatedMetadata);
     })
 
     .catch((e) => {

package/scripts/csdr/metadata/package.js

@@ -57,11 +57,38 @@ module.exports.getPackagesDeps = (depsType) => {
 
 
 
+const generateMetadataArray = (metadataArray, pkg, pkgVersion) => {
+  let idx;
 
-module.exports.storeMetadata = (
-    pkg, pkgVersion, pkgMetadata, isSnapshot, isMaster, isSupportBranch, isNextBranch, isSupportSnapshotBranch, isHotfixBranch,
-    pkgCompositeDeps, duration, envTarget
-  ) => {
+  const newPackage = {
+    name: pkg.name,
+    version: pkgVersion,
+    date: moment(new Date()).format("YYYYMMDD-HH:mm"),
+    npmPkg: pkg.npmPkg
+  };
+
+
+  if (metadataArray) {
+    idx = metadataArray.findIndex(item => item.name === pkg.name);
+  } else {
+    idx = -1;
+  }
+
+  if (idx > -1) {
+    metadataArray[idx] = newPackage;
+  } else {
+    if (!metadataArray) {
+      metadataArray = [];
+    }
+    metadataArray.push(newPackage);
+  }
+
+  return metadataArray;
+}
+
+
+
+module.exports.storeMetadata = (pkg, pkgVersion, pkgMetadata, branches, pkgCompositeDeps, duration, envTarget) => {
 
   tools.logTitle('Storing central and package metadata...');
 
@@ -69,6 +96,7 @@ module.exports.storeMetadata = (
 
   let devopsMetadata = {};
 
+
   return Promise.resolve()
 
     .then(() => {
@@ -102,152 +130,30 @@ module.exports.storeMetadata = (
         packagesHotfixTag = metadata.packages.packagesHotfixTag;
       }
 
-      const newPackage = {
-        name: pkg.name,
-        version: pkgVersion,
-        date: moment(new Date()).format("YYYYMMDD-HH:mm"),
-        status: 'PUBLISHED_TO_NEXUS',
-        npmPkg: pkg.npmPkg
-      };
+      if (branches.isSnapshot) {
+        metadata.packages = generateMetadataArray(packages, pkg, pkgVersion);
 
-      if (isSnapshot) {
-        var pkgIdx;
-        if (packages) {
-          pkgIdx = packages.findIndex(item => item.name === pkg.name);
-        } else {
-          pkgIdx = -1;
-        }
+      } else if (branches.isMaster) {
+        metadata.packagesLatestTag = generateMetadataArray(packagesLatestTag, pkg, pkgVersion);
 
-        if (pkgIdx > -1) {
-          packages[pkgIdx] = newPackage;
-        } else {
-          if (!packages) {
-            packages = [];
-          }
-          packages.push(newPackage);
-        }
-      }
+      } else if (branches.isMaster && pkg.build && pkg.build.masterBranchOnly) {
+        metadata.packages = generateMetadataArray(packages, pkg, pkgVersion);
 
-      if (isMaster) {
-        var pkgIdxLT;
-        if (packagesLatestTag) {
-          pkgIdxLT = packagesLatestTag.findIndex(item => item.name === pkg.name);
-        } else {
-          pkgIdxLT = -1;
-        }
+      } else if (branches.isSupportBranch) {
+        metadata.packagesPrevTag = generateMetadataArray(packagesPrevTag, pkg, pkgVersion);
 
-        if (pkgIdxLT > -1) {
-          packagesLatestTag[pkgIdxLT] = newPackage;
-        } else {
-          if (!packagesLatestTag) {
-            packagesLatestTag = [];
-          }
-          packagesLatestTag.push(newPackage);
-        }
-      }
+      } else if (branches.isSupportSnapshotBranch) {
+        metadata.packagesPrevSnapshotsTag = generateMetadataArray(packagesPrevSnapshotsTag, pkg, pkgVersion);
 
-      if (isMaster && pkg.build && pkg.build.masterBranchOnly) {
-        var pkgIdx;
-        if (packages) {
-          pkgIdx = packages.findIndex(item => item.name === pkg.name);
-        } else {
-          pkgIdx = -1;
-        }
+      } else if (branches.isNextBranch) {
+        metadata.packagesNextTag = generateMetadataArray(packagesNextTag, pkg, pkgVersion);
 
-        if (pkgIdx > -1) {
-          packages[pkgIdx] = newPackage;
-        } else {
-          if (!packages) {
-            packages = [];
-          }
-          packages.push(newPackage);
-        }
+      } else if (branches.isHotfixBranch) {
+        metadata.packagesHotfixTag = generateMetadataArray(packagesHotfixTag, pkg, pkgVersion);
       }
 
-      if (isSupportBranch) {
-        var pkgIdxPREV;
-        if (packagesPrevTag) {
-          pkgIdxPREV = packagesPrevTag.findIndex(item => item.name === pkg.name);
-        } else {
-          pkgIdxPREV = -1;
-        }
-
-        if (pkgIdxPREV > -1) {
-          packagesPrevTag[pkgIdxPREV] = newPackage;
-        } else {
-          if (!packagesPrevTag) {
-            packagesPrevTag = [];
-          }
-          packagesPrevTag.push(newPackage);
-        }
-      }
-
-      if (isSupportSnapshotBranch) {
-        var pkgIdxPREVSNP;
-        if (packagesPrevSnapshotsTag) {
-          pkgIdxPREVSNP = packagesPrevSnapshotsTag.findIndex(item => item.name === pkg.name);
-        } else {
-          pkgIdxPREVSNP = -1;
-        }
-
-        if (pkgIdxPREVSNP > -1) {
-          packagesPrevSnapshotsTag[pkgIdxPREVSNP] = newPackage;
-        } else {
-          if (!packagesPrevSnapshotsTag) {
-            packagesPrevSnapshotsTag = [];
-          }
-          packagesPrevSnapshotsTag.push(newPackage);
-        }
-      }
-
-      if (isNextBranch) {
-        var pkgIdxNEXT;
-        if (packagesNextTag) {
-          pkgIdxNEXT = packagesNextTag.findIndex(item => item.name === pkg.name);
-        } else {
-          pkgIdxNEXT = -1;
-        }
-
-        if (pkgIdxNEXT > -1) {
-          packagesNextTag[pkgIdxNEXT] = newPackage;
-        } else {
-          if (!packagesNextTag) {
-            packagesNextTag = [];
-          }
-          packagesNextTag.push(newPackage);
-        }
-      }
-
-      if (isHotfixBranch) {
-        var pkgIdxHOTFIX;
-        if (packagesHotfixTag) {
-          pkgIdxHOTFIX = packagesHotfixTag.findIndex(item => item.name === pkg.name);
-        } else {
-          pkgIdxHOTFIX = -1;
-        }
-
-        if (pkgIdxHOTFIX > -1) {
-          packagesHotfixTag[pkgIdxHOTFIX] = newPackage;
-        } else {
-          if (!packagesHotfixTag) {
-            packagesHotfixTag = [];
-          }
-          packagesHotfixTag.push(newPackage);
-        }
-      }
-
-      metadata.packages = packages;
-      metadata.packagesLatestTag = packagesLatestTag;
-      metadata.packagesPrevTag = packagesPrevTag;
-      metadata.packagesNextTag = packagesNextTag;
-      metadata.packagesPrevSnapshotsTag = packagesPrevSnapshotsTag;
-      metadata.packagesHotfixTag = packagesHotfixTag;
-
-      if (!dryRun) {
-        tools.writeJsonFileSync(metadataFile, metadata);
-      } else {
-        tools.logInfo(`Write metadata on ${metadataFile}`);
-      }
+      tools.logInfo(`Writing central metadata on : ${metadataFile}`);
+      tools.writeJsonFileSync(metadataFile, metadata);
 
       devopsMetadata = metadata;
     })
@@ -263,13 +169,13 @@ module.exports.storeMetadata = (
     })
 
     .then(() => {
-      if (isMaster) {
+      if (branches.isMaster) {
         return storeBuildMetadata(pkg, pkgVersion, pkgMetadata, envTarget);
       }
     })
 
     .then(() => {
-      if (isMaster) {
+      if (branches.isMaster) {
         return storePipelineMetadata(pkgMetadata);
       }
     })
@@ -303,7 +209,7 @@ const storeBuildMetadata = (pkg, pkgVersion, pkgMetadata, envTarget) => {
       let pkgMetadataFile;
 
       if (pkg.backend) {
-        pkgMetadataFile = path.join(pkg.paths.pkgDirectory, 'package-build-metadata.json');
+        pkgMetadataFile = path.join(pkg.paths.root, 'package-build-metadata.json');
       } else {
         pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsMetadataFile);
       }
@@ -317,9 +223,7 @@ const storeBuildMetadata = (pkg, pkgVersion, pkgMetadata, envTarget) => {
       generatedMetadata.versions = versions;
 
       tools.logInfo(`Write metadata on ${pkgMetadataFile}`);
-      if (!dryRun) {
-        tools.writeJsonFileSync(pkgMetadataFile, generatedMetadata);
-      }
+      tools.writeJsonFileSync(pkgMetadataFile, generatedMetadata);
     })
 
     .catch((e) => {
@@ -403,8 +307,8 @@ const storePipelineMetadata = (pkgMetadata) => {
 module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
   return Promise.resolve()
     .then(() => {
-      const pkgMetadataFile = path.join(pkg.paths.pkgBuild, 'bundles', 'package-metadata.json');
-      const pkgMetadataRootFile = path.join(pkg.paths.pkgDirectory, 'package-metadata.json');
+      const pkgMetadataFile = path.join(pkg.paths.dist, 'bundles', 'package-metadata.json');
+      const pkgMetadataRootFile = path.join(pkg.paths.root, 'package-metadata.json');
 
       const pkgMetadata = {
         dependencies: pkgCompositeDeps
@@ -434,8 +338,11 @@ module.exports.getPackageVersionsJson = (pkg) => {
   tools.logInfo(`Getting package versions for : ${pkg.name}...`);
 
   const configOptions = configUtils.global.getConfigOptions();
+
   const pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile);
 
+  tools.logInfo(`from ${pkgMetadataFile}`);
+
   return tools.getJsonFileContent(pkgMetadataFile);
 }
 
@@ -530,7 +437,6 @@ module.exports.lockPackage = (pkg) => {
 }
 
 
-
 module.exports.unlockPackage = (pkg) => {
   tools.logTitle('Unlocking package');