@eui/tools 5.0.0-rc.16 → 5.0.0-rc.19

package/.version.properties

@@ -1 +1 @@
-5.0.0-rc.16
+5.0.0-rc.19

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.0.0-rc.19 (2022-04-01)
+
+##### Bug Fixes
+
+* **other:**
+  * remote envTarget version generated not incrementing - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([5a3373fe](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5a3373fe7ae4c0a12acba4655d653c718422df50))
+
+* * *
+* * *
+## 5.0.0-rc.18 (2022-03-31)
+
+##### Bug Fixes
+
+* **other:**
+  * added compositeType as exported gitlab variables - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([606a7916](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/606a791695f6697bfa34b14dd4ddf0e5a132e119))
+
+* * *
+* * *
+## 5.0.0-rc.17 (2022-03-31)
+
+##### Bug Fixes
+
+* **other:**
+  * export of app_target - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([2452d13b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2452d13b517f261642079795721af154991c9c88))
+
+* * *
+* * *
 ## 5.0.0-rc.16 (2022-03-31)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.0.0-rc.16",
+    "version": "5.0.0-rc.19",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -16,6 +16,7 @@ const installUtils = require('./scripts/csdr/install/install-utils');
 const notificationUtils = require('./scripts/utils/notification/notification-utils');
 const translationUtils = require('./scripts/utils/pre-build/translations/translation-utils');
 const apiUtils = require('./scripts/utils/api-utils');
+const versionUtils = require('./scripts/csdr/version/version-utils');
 
 // console.log(configUtils.packages.getPackages());
 // console.log(configUtils.packages.getPackage('eui-tools'));
@@ -736,20 +737,29 @@ const apiUtils = require('./scripts/utils/api-utils');
 //   })
 
 
+// Promise.resolve()
+//   .then(() => {
+//     return apiUtils.login();
+//   })
+//   .then((response) => {
+//     console.log(response);
+//   })
+//   .then(() => {
+//     return apiUtils.getDevopsMetadata();
+//   })
+//   .then((response) => {
+//     console.log(response);
+//   })
+//   .catch((e) => {
+//     console.log(e);
+//   })
+
+const pkg = configUtils.packages.getPackage('mywp-dummy-eui10-remote-el-ui');
+
 Promise.resolve()
   .then(() => {
-    return apiUtils.login();
+    return versionUtils.packageRemote.getNewVersion(pkg, 'DEV');
   })
-  .then((response) => {
-    console.log(response);
-  })
-  .then(() => {
-    return apiUtils.getDevopsMetadata();
+  .then((version) => {
+    console.log(version);
   })
-  .then((response) => {
-    console.log(response);
-  })
-  .catch((e) => {
-    console.log(e);
-  })
-

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

@@ -452,9 +452,11 @@ module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, dur
 }
 
 
-module.exports.exportPipelineVariables = (pkg) => {
+module.exports.exportPipelineVariables = (pkg, compositeType) => {
   utils.tools.logBanner('EXPORT PIPELINE VARIABLES');
 
+  let variablesContent = '';
+
   return Promise.resolve()
   .then(() => {
     if (pkg.remote) {
@@ -470,11 +472,18 @@ module.exports.exportPipelineVariables = (pkg) => {
 
       utils.tools.logInfo(`appTarget generated : ${appTarget}`);
 
+      variablesContent += `export APP_TARGET=${appTarget}\n`;
+
+      if (compositeType) {
+        utils.tools.logInfo(`Exporting COMPOSITE_TYPE : ${compositeType}`);
+        variablesContent += `export COMPOSITE_TYPE=${compositeType}\n`;
+      }
+
       if (dryRun) {
         utils.tools.logWarning('dryRun...skipping export');
       } else {
         utils.tools.logInfo('Exporting appTarget variable');
-        return utils.pipeline.setVariables(pkg.paths.rootDirectory, `export APP_TARGET=${pkg.build.appTarget}\n`);
+        return utils.pipeline.setVariables(pkg.paths.rootDirectory, variablesContent);
       }
     }
   })

package/scripts/csdr/release/package/release-package.js

@@ -178,7 +178,7 @@ module.exports.run = () => {
 
       // EXPORT ADDITIONAL PIPELINE VARIABLES
       .then(() => {
-        return innerCommon.exportPipelineVariables(pkg);
+        return innerCommon.exportPipelineVariables(pkg, compositeType);
       })
 
 

package/scripts/csdr/version/common.js

@@ -12,14 +12,17 @@ const getNewVersionForDev = (versionsMetadata, envsMetadata, rootEnv) => {
   const lastIntMetadata = envsMetadata[rootEnv];
 
   if (lastIntMetadata) {
+    tools.logInfo('Last INT metadata found')
     const rootVersion = semver.coerce(envsMetadata[rootEnv].version).raw;
     version = semver.inc(rootVersion, 'major') + '-SNAPSHOT';
+    tools.logInfo(`base version : ${version}`);
+
   } else {
+    tools.logInfo('No INT metadata found : initializing version');
     version = '1.0.0-SNAPSHOT';
+    tools.logInfo(`version intialized : ${version}`);
   }
 
-  tools.logInfo(`Probable new version : ${version}`);
-
   // if no versions history is found for the current project, initial version is set
   if (!versionsMetadata.versions) {
     tools.logSuccess(`No historical version found : version = ${version}`);
@@ -28,16 +31,18 @@ const getNewVersionForDev = (versionsMetadata, envsMetadata, rootEnv) => {
   } else {
     // check if the root version already exsists
     const prevVersions = versionsMetadata.versions.filter((v) => {
-      return v.name.indexOf(version) > -1;
+      return v.version.indexOf(version) > -1;
     });
 
+    tools.logInfo(`prevVersions found : ${JSON.stringify(prevVersions, null, 2)}`);
+
     // do the increment over the last version found having the same root version
     if (prevVersions.length) {
       const lastVersion = prevVersions[prevVersions.length - 1];
 
       if (lastVersion) {
-        tools.logInfo(`Version already found [${lastVersion.name}]`);
-        version = semver.inc(lastVersion.name, 'prerelease');
+        tools.logInfo(`Version already found [${lastVersion.version}]`);
+        version = semver.inc(lastVersion.version, 'prerelease');
         tools.logSuccess(`Final version : ${version}`);
       }
 
@@ -65,14 +70,14 @@ const getNewVersionForProd = (versionsMetadata, envsMetadata) => {
 
   // check if the root version already exists
   const prevVersions = versionsMetadata.versions.filter((v) => {
-    return v.name.indexOf(rootVersionMinor) > -1 && v.envTarget === 'PROD';
+    return v.version.indexOf(rootVersionMinor) > -1 && v.envTarget === 'PROD';
   });
 
   if (prevVersions.length) {
     const lastVersion = prevVersions[prevVersions.length - 1];
 
-    tools.logInfo(`Version already found [${lastVersion.name}]`);
-    version = semver.inc(lastVersion.name, 'patch');
+    tools.logInfo(`Version already found [${lastVersion.version}]`);
+    version = semver.inc(lastVersion.version, 'patch');
     tools.logInfo(`Incremented version : ${version}`);
 
   } else {
@@ -105,14 +110,14 @@ const getNewVersionForEnv = (versionsMetadata, envsMetadata, rootEnv, envTarget)
 
   // check if the root version already exists
   const prevVersions = versionsMetadata.versions.filter((v) => {
-    return v.name.indexOf(rootVersion) > -1 && v.envTarget === envTarget;
+    return v.version.indexOf(rootVersion) > -1 && v.envTarget === envTarget;
   });
 
   if (prevVersions.length) {
     const lastVersion = prevVersions[prevVersions.length - 1];
 
-    tools.logInfo(`Version already found [${lastVersion.name}]`);
-    version = semver.inc(lastVersion.name, 'prerelease');
+    tools.logInfo(`Version already found [${lastVersion.version}]`);
+    version = semver.inc(lastVersion.version, 'prerelease');
     tools.logInfo(`Incremented version : ${version}`);
 
   } else {

package/scripts/csdr/version/{common..test.js → common.test.js}

@@ -1,21 +1,25 @@
 const common = require('./common');
 const { expect, assert } = require('chai');
 
+const emptyVersionsMetadata = {};
+
 const versionsMetadata = {
   "versions": [
     {
-      "name": "118.0.0-SNAPSHOT.13",
+      "version": "118.0.0-SNAPSHOT.13",
       "releaseDate": "01/01/2019 00:00",
       "envTarget": "DEV"
     },
     {
-      "name": "117.0.0-TST.0",
+      "version": "117.0.0-TST.0",
       "releaseDate": "01/01/2019 00:00",
       "envTarget": "TST"
     }
   ]
 };
 
+const emptyEnvsMetadata = {};
+
 const envsMetadata = {
   "DEV": {
       "version": "118.0.0-SNAPSHOT.13",
@@ -105,6 +109,13 @@ describe('[CSDR-version-app-env-target] - getNewVersionDefault()', () => {
   * DLT 3.0.0-DLT.0 = PROD
   */
 
+  it('version for DEV should initialize when no envsMetadata and no versionsMetadata', () => {
+    return common.getNewVersionDefault('DEV', emptyVersionsMetadata, emptyEnvsMetadata)
+      .then((version) => {
+        expect(version).to.equal('1.0.0-SNAPSHOT.0');
+      })
+  })
+
   it('version for DEV should return INT raw major + 1', () => {
     return common.getNewVersionDefault('DEV', versionsMetadata, envsMetadata)
       .then((version) => {
@@ -144,7 +155,7 @@ describe('[CSDR-version-app-env-target] - getNewVersionDefault()', () => {
     const versionsMetadata = {
       "versions": [
         {
-          "name": "117.0.0",
+          "version": "117.0.0",
           "releaseDate": "01/01/2019 00:00",
           "envTarget": "PROD"
         },
@@ -160,12 +171,12 @@ describe('[CSDR-version-app-env-target] - getNewVersionDefault()', () => {
     const versionsMetadata = {
       "versions": [
         {
-          "name": "117.0.0",
+          "version": "117.0.0",
           "releaseDate": "01/01/2019 00:00",
           "envTarget": "PROD"
         },
         {
-          "name": "117.0.1",
+          "version": "117.0.1",
           "releaseDate": "01/01/2019 00:00",
           "envTarget": "PROD"
         }

package/scripts/csdr/version/version-utils.js

@@ -1,16 +1,21 @@
 'use strict';
 
-// externals
-const moment = require('moment');
-
-// local
-const tools = require('../../utils/tools');
-
 // inner modules
 const innerApp = require('./app');
+const innerAppCommon = require('./app-common');
+const innerAppDefault = require('./app-default');
+const innerAppEnvTarget = require('./app-env-target');
 const innerPackage = require('./package');
+const innerPackageCommon = require('./package-common');
+const innerPackageRemote = require('./package-remote');
+const innerPackageDefault = require('./package-default');
 
 // re-exports inner modules
 module.exports.app = innerApp;
+module.exports.appCommon = innerAppCommon;
+module.exports.appDefault = innerAppDefault;
+module.exports.appEnvTarget = innerAppEnvTarget;
 module.exports.package = innerPackage;
-
+module.exports.packageCommon = innerPackageCommon;
+module.exports.packageRemote = innerPackageRemote;
+module.exports.packageDefault = innerPackageDefault;