@eui/tools 4.19.17 → 4.20.0

package/.version.properties

@@ -1 +1 @@
-4.19.17
+4.20.0

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 4.20.0 (2022-03-14)
+
+##### New Features
+
+* **other:**
+  * split devops-metadata and devops-metadata-locks usage to split commit - race conditions - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([ffc3871b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ffc3871b107cb1a9e23d8172e78d89e76a039de0))
+
+* * *
+* * *
+## 4.19.19 (2022-03-10)
+
+##### Bug Fixes
+
+* **other:**
+  * avoid snapshot fetch in TST and up composition for prevSnapshots releases - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([2694274d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2694274d522c9361b430a557a04557b717080614))
+
+* * *
+* * *
+## 4.19.18 (2022-03-09)
+
+##### Bug Fixes
+
+* **other:**
+  * support/develop snapshot carret resolution - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([340146a1](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/340146a1237e36eeaec01d3ef9c2c8990772d718))
+
+* * *
+* * *
 ## 4.19.17 (2022-03-09)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -631,13 +631,7 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 //     tools.logBanner('this is the content of the banner');
 //   })
 
-// return Promise.resolve()
-//   .then(() => {
-//     const prjName = 'eui-showcase-ux';
-//     const prj = configUtils.projects.getCsdrProject(prjName);
 
-//     return compositeUtils.getDeps(prj, 'TST');
-//   })
 
 
 
@@ -667,8 +661,35 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 
 
 
+// return Promise.resolve()
+//   .then(() => {
+//     const pkg = configUtils.packages.getPackage('eui', true);
+//     console.log(pkg);
+//   })
+
+// return Promise.resolve()
+//   .then(() => {
+//     const pkg =  configUtils.packages.getPackageByNpmPkg('@csdr/core', true);
+//     console.log(pkg);
+//     const versions = metadataUtils.package.getPackageVersions(pkg);
+
+//     console.log(
+//       versions.filter((v) => {
+//         return v.version.split('.')[0] === '1'
+//       }).splice(-1)[0]
+//     );
+//   })
+
+// return Promise.resolve()
+//   .then(() => {
+//     const prjName = 'my-workplace';
+//     const prj = configUtils.projects.getCsdrProject(prjName);
+
+//     return compositeUtils.getDeps(prj, 'DEV');
+//   })
+
 return Promise.resolve()
   .then(() => {
-    const pkg = configUtils.packages.getPackage('eui', true);
-    console.log(pkg);
+    const configOptions = configUtils.global.getConfigOptions();
+    console.log(configOptions);
   })

package/scripts/csdr/config/global.js

@@ -210,7 +210,9 @@ module.exports.getConfigOptions = () => {
 
   let configOptions = {
     DEVOPS_METADATA_REPOSITORY: null,
+    DEVOPS_METADATA_LOCKS_REPOSITORY: null,
     DEVOPS_METADATA_PATH: null,
+    DEVOPS_METADATA_LOCKS_PATH: null,
     DEVOPS_METADATA_JSON: '.devops-metadata.json',
     DEVOPS_CONFIG_JSON: '.devops-config.json',
     ISSUES_MANAGER_HOST: null,
@@ -234,6 +236,12 @@ module.exports.getConfigOptions = () => {
     if (devopsMetadata.folder) {
       configOptions.DEVOPS_METADATA_PATH = path.join(process.cwd(), devopsMetadata.folder);
     }
+    if (devopsMetadata.locksRepository) {
+      configOptions.DEVOPS_METADATA_LOCKS_REPOSITORY = devopsMetadata.locksRepository;
+    }
+    if (devopsMetadata.locksFolder) {
+      configOptions.DEVOPS_METADATA_LOCKS_PATH = path.join(process.cwd(), devopsMetadata.locksFolder);
+    }
   }
 
   // getting issues manager options

package/scripts/csdr/install/build-package.js

@@ -63,7 +63,7 @@ module.exports.install = (prj, pkg, isMaster) => {
     })
 
     .then((depsMetadata) => {
-      return innerCommon.getRemappedDeps(depsMetadata, localPkgCompositeDeps);
+      return innerCommon.getRemappedDeps(depsMetadata, localPkgCompositeDeps, false);
     })
 
     .then((remappedLocalPkgCompositeDeps) => {

package/scripts/csdr/install/common.js

@@ -72,7 +72,7 @@ const executeInstall = (cwdPath) => {
 }
 
 
-const getRemappedDeps = (pkgDeps, pkgDefaultDeps) => {
+const getRemappedDeps = (pkgDeps, pkgDefaultDeps, isMaster) => {
 
   return Promise.resolve()
     .then(() => {
@@ -114,7 +114,7 @@ const getRemappedDeps = (pkgDeps, pkgDefaultDeps) => {
     })
 
     .then((remappedDeps) => {
-      return getResolvedCarretDeps(remappedDeps);
+      return getResolvedCarretDeps(remappedDeps, isMaster);
     })
 
 
@@ -127,7 +127,7 @@ const getRemappedDeps = (pkgDeps, pkgDefaultDeps) => {
 
 
 
-const getResolvedCarretDeps = (deps) => {
+const getResolvedCarretDeps = (deps, isMaster) => {
   tools.logTitle('Resolving carret for next version packages');
 
   tools.logInfo('processing dependencies : ');
@@ -148,7 +148,7 @@ const getResolvedCarretDeps = (deps) => {
             const pkg =  configUtils.packages.getPackageByNpmPkg(npmPkg, true);
 
             // getting last major version from metadata history for pkg found
-            const lastMajorVersion = metadataUtils.package.getLastMajorVersion(pkg, version.substr(1).split('.')[0]);
+            const lastMajorVersion = metadataUtils.package.getLastMajorVersion(pkg, version.substr(1).split('.')[0], isMaster);
 
             if (lastMajorVersion) {
               tools.logInfo(`--version found : ${lastMajorVersion}`);
@@ -275,7 +275,7 @@ const getLocalPackagesCompositeDepsRemapped = () => {
     .then((depsMetadata) => {
       const compositeDeps = getLocalPackagesCompositeDeps();
 
-      return getRemappedDeps(depsMetadata, compositeDeps);
+      return getRemappedDeps(depsMetadata, compositeDeps, false);
     })
 
     .then((remappedDeps) => {

package/scripts/csdr/install/composite-utils.js

@@ -104,7 +104,7 @@ const getDeps_DEV = (prj, prjDeps) => {
 
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
     .then((pkgDeps) => {
-      return innerCommon.getRemappedDeps(pkgDeps, prjDeps);
+      return innerCommon.getRemappedDeps(pkgDeps, prjDeps, false);
     })
 
     .catch((e) => {
@@ -131,7 +131,7 @@ const getDeps_TST = (prj, prjDeps) => {
 
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
     .then((pkgDeps) => {
-      return innerCommon.getRemappedDeps(pkgDeps, prjDeps);
+      return innerCommon.getRemappedDeps(pkgDeps, prjDeps, true);
     })
 
     .catch((e) => {

package/scripts/csdr/install/local-dev.js

@@ -85,7 +85,7 @@ module.exports.install = (pkg) => {
       tools.logInfo('Packages composite deps found : ');
       console.log(packagesCompositeDeps);
 
-      return innerCommon.getRemappedDeps(depsMetadata, configDeps);
+      return innerCommon.getRemappedDeps(depsMetadata, configDeps, false);
     })
 
 

package/scripts/csdr/install/remote.js

@@ -156,7 +156,7 @@ const getDeps = (pkg, isMaster, envTarget = null) => {
       // if (envTarget) {
       // }
 
-      return innerCommon.getRemappedDeps(depsMetadata, { ...depsBase, ...depsComposite});
+      return innerCommon.getRemappedDeps(depsMetadata, { ...depsBase, ...depsComposite}, isMaster || envTarget !== null);
     })
 
     .catch((e) => {

package/scripts/csdr/metadata/common.js

@@ -37,6 +37,27 @@ module.exports.cloneMetadataRepo = () => {
 }
 
 
+module.exports.cloneMetadataLocksRepo = () => {
+  const configOptions = configUtils.global.getConfigOptions();
+
+  tools.logTitle('Cloning devops metadata locks repo');
+
+  if (dryRun || skipClone) {
+    tools.logInfo('DRY-RUN: cloning skipped');
+    return Promise.resolve();
+
+  } else {
+    return Promise.resolve()
+      .then(() => {
+        return gitUtils.cloneRepo(configOptions.DEVOPS_METADATA_LOCKS_REPOSITORY, configOptions.DEVOPS_METADATA_LOCKS_PATH, false, true);
+      })
+      .catch((e) => {
+        throw e;
+      })
+  }
+}
+
+
 module.exports.getDevopsMetadata = () => {
   const configOptions = configUtils.global.getConfigOptions();
   const DEVOPS_METADATA_PATH = configOptions.DEVOPS_METADATA_PATH;

package/scripts/csdr/metadata/package.js

@@ -459,67 +459,30 @@ module.exports.getPackageVersionsLatest = (pkg) => {
 }
 
 
-module.exports.getPackageVersionsByMajor = (pkg, major) => {
+module.exports.getPackageVersionsByMajor = (pkg, major, isMaster) => {
   const pkgVersions = this.getPackageVersions(pkg);
 
   if (pkgVersions) {
     return pkgVersions.filter((v) => {
       return (v.version.split('.')[0] === major && v.version.indexOf('snapshot') === -1) ||
-             (v.version.split('.')[0] === major && pkg.build && pkg.build.isNextMajorSnapshotAllowed);
+             (v.version.split('.')[0] === major && pkg.build && pkg.build.isNextMajorSnapshotAllowed) ||
+             (v.version.split('.')[0] === major && pkg.build && pkg.build.supportSnapshotBranch) ||
+             (v.version.split('.')[0] === major && v.version.indexOf('snapshot') === -1 && isMaster);
     })
   }
 }
 
-module.exports.getLastMajorVersion = (pkg, major) => {
-  const pkgVersionsMajor = this.getPackageVersionsByMajor(pkg, major);
+module.exports.getLastMajorVersion = (pkg, major, isMaster) => {
+  const pkgVersionsMajor = this.getPackageVersionsByMajor(pkg, major, isMaster);
 
   if (pkgVersionsMajor && pkgVersionsMajor.length !== 0) {
     return pkgVersionsMajor.splice(-1)[0].version;
   }
 }
 
-module.exports.devopsMetadataToTable = (metadata) => {
-  tools.logTitle('Generating table from metadata...');
-
-  var content = '';
-
-  content += '<h3>Latest packages status</h3>';
-  content += '<table><thead><tr>';
-  content += '<th>PACKAGE</th>';
-  content += '<th>VERSION</th>';
-  content += '<th>DATE</th>';
-  content += '<th>STATUS</th>';
-  content += '</tr></thead>';
-  content += '<tbody>';
-  tools.sortArray(metadata.packages, 'name').forEach((item) => {
-    content += '<tr>';
-    content += `<td>${item.name}</td><td>${item.version}</td><td>${item.date}</td><td>${item.status}</td>`
-    content += '</tr>';
-  })
-  content += '</tbody>';
-  content += '</table>';
-
-  if (metadata.packagesLatestTag && metadata.packagesLatestTag.length !== 0) {
-    content += '<h3>Latest package tags</h3>';
-    content += '<table><thead><tr>';
-    content += '<th>PACKAGE</th>';
-    content += '<th>VERSION</th>';
-    content += '<th>DATE</th>';
-    // content+= '<th>STATUS</th>';
-    content += '</tr></thead>';
-    content += '<tbody>';
-    tools.sortArray(metadata.packagesLatestTag, 'name').forEach((item) => {
-      content += '<tr>';
-      content += `<td>${item.name}</td><td>${item.version}</td><td>${item.date}</td>`
-      content += '</tr>';
-    })
-    content += '</tbody>';
-    content += '</table>';
-  }
 
-  tools.logSuccess();
-  return content;
-}
+
+
 
 
 
@@ -530,7 +493,7 @@ module.exports.lockPackage = (pkg) => {
     .then(() => {
 
       const configOptions = configUtils.global.getConfigOptions();
-      const pkgLockFile = path.join(configOptions.DEVOPS_METADATA_PATH, `${pkg.name}-lock.json`);
+      const pkgLockFile = path.join(configOptions.DEVOPS_METADATA_LOCKS_PATH, `${pkg.name}-lock.json`);
 
       const lockContent = {
         locked: true,
@@ -544,7 +507,7 @@ module.exports.lockPackage = (pkg) => {
         return gitUtils.commitAndPush(
           'master',
           `chore: locking ${pkg.name}`,
-          configOptions.DEVOPS_METADATA_PATH
+          configOptions.DEVOPS_METADATA_LOCKS_PATH
         );
       }
     })
@@ -563,7 +526,7 @@ module.exports.unlockPackage = (pkg) => {
     .then(() => {
 
       const configOptions = configUtils.global.getConfigOptions();
-      const pkgLockFile = path.join(configOptions.DEVOPS_METADATA_PATH, `${pkg.name}-lock.json`);
+      const pkgLockFile = path.join(configOptions.DEVOPS_METADATA_LOCKS_PATH, `${pkg.name}-lock.json`);
 
       tools.remove(pkgLockFile);
 
@@ -572,7 +535,7 @@ module.exports.unlockPackage = (pkg) => {
         return gitUtils.commitAndPush(
           'master',
           `chore: unlocking ${pkg.name}`,
-          configOptions.DEVOPS_METADATA_PATH
+          configOptions.DEVOPS_METADATA_LOCKS_PATH
         );
       }
     })
@@ -585,7 +548,7 @@ module.exports.unlockPackage = (pkg) => {
 
 module.exports.isPackageLocked = (pkg) => {
   const configOptions = configUtils.global.getConfigOptions();
-  const pkgLockFile = path.join(configOptions.DEVOPS_METADATA_PATH, `${pkg.name}-lock.json`);
+  const pkgLockFile = path.join(configOptions.DEVOPS_METADATA_LOCKS_PATH, `${pkg.name}-lock.json`);
 
   if (dryRun) return false;
 

package/scripts/csdr/release/package/common.js

@@ -82,6 +82,11 @@ module.exports.init = (pkg) => {
     return metadataUtils.common.cloneMetadataRepo();
   })
 
+  // CLONE METADATA LOCKS REPO
+  .then(() => {
+    return metadataUtils.common.cloneMetadataLocksRepo();
+  })
+
   // REMOVE YARN.LOCK
   .then(() => {
     utils.tools.logInfo('Removing yarn.lock');