@eui/tools 6.12.53 → 6.12.55

package/.version.properties

@@ -1 +1 @@
-6.12.53
+6.12.55

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.55 (2023-09-15)
+
+##### Bug Fixes
+
+* **other:**
+  * prevent unknown supported branches to be processed by build release - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([7a42606a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/7a42606a91fa9523b3cc5eedcce7438334fcc863))
+
+* * *
+* * *
+## 6.12.54 (2023-09-15)
+
+##### Chores
+
+* **other:**
+  * prevent RC release to go up in other env then DEV - collision of dependencies snapshot/latest prevention - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([0164bc8e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0164bc8e06765a378dec2f535407e8cfc81dd6d5))
+
+* * *
+* * *
 ## 6.12.53 (2023-09-14)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -22,6 +22,7 @@ const apiUtils = require('./scripts/utils/api-utils');
 const versionUtils = require('./scripts/csdr/version/version-utils');
 const publishUtils = require('./scripts/utils/publish/publish-utils');
 
+
 // console.log(configUtils.packages.getPackages());
 // console.log(configUtils.packages.getPackage('eui-tools'));
 
@@ -1319,13 +1320,36 @@ const publishUtils = require('./scripts/utils/publish/publish-utils');
 //     console.log(e);
 //   })
 
+// Promise.resolve()
+//   .then(() => {
+//     const pkgs = configUtils.packages.getPackages();
+//     console.log(pkgs);
+//   })
+
+//   .catch((e) => {
+//     console.log(e);
+//   })
+
+// Promise.resolve()
+//   .then(() => {
+//     const pkg = configUtils.remotes.getRemote('cc-task-details-eui15-remote-el-ui', true);
+//     console.log(pkg);
+
+//     const deps = installUtils.remotes.getDeps(pkg, 'TST');
+//     console.log(deps);
+
+//   })
+
+//   .catch((e) => {
+//     console.log(e);
+//   })
+
 Promise.resolve()
   .then(() => {
-    const pkgs = configUtils.packages.getPackages();
-    console.log(pkgs);
+    const util = require('./scripts/csdr/release/package/common');
+    const branches = util.getBranches();
+    console.log(branches);
   })
-
   .catch((e) => {
     console.log(e);
   })
-

package/scripts/csdr/install/common.js

@@ -92,7 +92,7 @@ module.exports.executeInstallPackage = (cwdPath, npmPkg) => {
 
 
 
-module.exports.getResolvedCarretDeps = (deps, isMaster) => {
+module.exports.getResolvedCarretDeps = (deps, isMaster, isDevEnvTarget) => {
   tools.logTitle('Resolving carret versions for prev or next version packages');
 
   tools.logInfo('processing dependencies : ');
@@ -113,7 +113,7 @@ module.exports.getResolvedCarretDeps = (deps, isMaster) => {
             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], isMaster);
+            const lastMajorVersion = metadataUtils.package.getLastMajorVersion(pkg, version.substr(1).split('.')[0], isMaster, isDevEnvTarget);
 
             if (lastMajorVersion) {
               tools.logInfo(`--version found : ${lastMajorVersion}`);

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

@@ -16,7 +16,7 @@ const innerCommon = require('./common');
 const getDeps_DEV = (compositeDeps, prevSnapshotEnabled) => {
   return Promise.resolve()
     .then(() => {
-      return innerCommon.getResolvedCarretDeps(compositeDeps, false);
+      return innerCommon.getResolvedCarretDeps(compositeDeps, false, true);
     })
 
     .catch((e) => {
@@ -30,7 +30,7 @@ const getDeps_TST = (compositeDeps, prevSnapshotEnabled) => {
   return Promise.resolve()
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
     .then((metadataDeps) => {
-      return innerCommon.getResolvedCarretDeps(compositeDeps, true);
+      return innerCommon.getResolvedCarretDeps(compositeDeps, true, false);
     })
 
     .catch((e) => {
@@ -76,6 +76,18 @@ const getCompositeDepsByEnv = (compositePath, envTarget, compositeType, envsMeta
 
       return { ...prevEnvDeps, ...returnedDeps };
     })
+    .then((deps) => {
+      tools.logInfo('Scanning resulting deps for RC detection (do avoid RC spreading up to non DEV envs)');
+      const depsToScan = Object.keys(deps);
+      depsToScan.forEach((d) => {
+        if (deps[d].indexOf('-rc.') > -1) {
+          tools.logInfo(`RC deps found : ${deps[d]}`);
+          tools.logWarning('In order to prevent this, your RC next/ branch should be released to develop/master branch of the package, support/ branch created for supporting older version in upper environments')
+          throw new Error('NOT_ALLOWED_RC_DEPS_FOR_NON_DEV_ENVIRONMENT_FOUND');
+        }
+      })
+      return deps;
+    })
     .catch((e) => {
       throw e;
     })
@@ -94,6 +106,18 @@ const getCompositeDepsByEnv = (compositePath, envTarget, compositeType, envsMeta
 
       return { ...currentEnvDeps, ...fileDeps };
     })
+    .then((deps) => {
+      tools.logInfo('Scanning resulting deps for RC detection (do avoid RC spreading up to non DEV envs)');
+      const depsToScan = Object.keys(deps);
+      depsToScan.forEach((d) => {
+        if (deps[d].indexOf('-rc.') > -1) {
+          tools.logInfo(`RC deps found : ${deps[d]}`);
+          tools.logWarning('In order to prevent this, your RC next/ branch should be released to develop/master branch of the package, support/ branch created for supporting older version in upper environments')
+          throw new Error('NOT_ALLOWED_RC_DEPS_FOR_NON_DEV_ENVIRONMENT_FOUND');
+        }
+      })
+      return deps;
+    })
     .catch((e) => {
       throw e;
     })

package/scripts/csdr/metadata/package.js

@@ -280,7 +280,7 @@ module.exports.isNewPackageBuild = (pkg) => {
   }
 }
 
-module.exports.getPackageVersionsByMajor = (pkg, major, isMaster) => {
+module.exports.getPackageVersionsByMajor = (pkg, major, isMaster, isDevEnvTarget) => {
   const pkgVersions = this.getPackageVersions(pkg);
 
   if (pkgVersions) {
@@ -303,12 +303,18 @@ module.exports.getPackageVersionsByMajor = (pkg, major, isMaster) => {
     versions = versions.filter(v => !v.hotfix);
     tools.logInfo(`----> ${versions.length} metadata versions excluding hotfix version type`);
 
+    if (!isDevEnvTarget) {
+      tools.logInfo('----=> excludingi RC release of versions found for non-DEV build (preventing RC releases to go to another env than DEV');
+      versions = versions.filter(v => v.version.indexOf('-rc.') === -1);
+      tools.logInfo(`----> ${versions.length} metadata versions excluding hotfix version type`);
+    }
+
     return versions;
   }
 }
 
-module.exports.getLastMajorVersion = (pkg, major, isMaster) => {
-  const pkgVersionsMajor = this.getPackageVersionsByMajor(pkg, major, isMaster);
+module.exports.getLastMajorVersion = (pkg, major, isMaster, isDevEnvTarget) => {
+  const pkgVersionsMajor = this.getPackageVersionsByMajor(pkg, major, isMaster, isDevEnvTarget);
 
   if (pkgVersionsMajor && pkgVersionsMajor.length !== 0) {
     return pkgVersionsMajor.splice(-1)[0].version;

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

@@ -26,6 +26,12 @@ const getBranches = module.exports.getBranches = () => {
   const isHotfix = (!isMaster && !isSnapshot && !isSupportSnapshot && !isSupport && branch.indexOf('hotfix/') > -1);
   const isNext = (!isMaster && !isSnapshot && !isSupport && !isSupportSnapshot && !isHotfix && branch.indexOf('next/') > -1);
 
+  let valid = true;
+
+  if (!isSnapshot && !isMaster && !isSupportSnapshot && !isSupport && !isHotfix && !isNext) {
+    valid = false;
+  }
+
   return {
     isSupport: isSupport,
     isSupportSnapshot: isSupportSnapshot,
@@ -33,7 +39,8 @@ const getBranches = module.exports.getBranches = () => {
     isSnapshot: isSnapshot,
     isMaster: isMaster,
     isHotfix: isHotfix,
-    branch: branch
+    branch: branch,
+    valid: valid
   }
 }
 
@@ -182,6 +189,21 @@ module.exports.preReleaseChecks = (pkg) => {
     return metadataUtils.common.isPipelineEnabled(pkg);
   })
 
+  // CHECK BRANCH VALIDITY
+  .then(() => {
+    const branches = this.getBranches();
+
+    utils.tools.logTitle('Checking branch validity');
+
+    if (!branches.valid) {
+      utils.tools.logInfo('Branch not supported ... stopping : allowed branches are develop-master-next/-support/-hotfix/');
+      throw 'BRANCH_NOT_SUPPORTED';
+
+    } else {
+      utils.tools.logInfo('Branch is valid... processing');
+    }
+  })
+
   // CHECKING PACKAGE LOCK STATE - AVOID SAME PACKAGE RUN issuing race conditions
   .then(() => {
     if (!pkg.backend) {