@eui/tools 5.1.3 → 5.1.6

package/.version.properties

@@ -1 +1 @@
-5.1.3
+5.1.6

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.1.6 (2022-04-28)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong call to app.getCurrentVersion - broken generateDiffReport for master remote release - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([4ef345fe](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4ef345feb678b416924f87593d9ce860b38aff15))
+
+* * *
+* * *
+## 5.1.5 (2022-04-28)
+
+##### Bug Fixes
+
+* **other:**
+  * old remote delivery issues on version upgrade - adapted metadata version for app delivery - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([0499f9f0](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0499f9f0ba9b4df56c39773922a3f721476e9a82))
+
+* * *
+* * *
+## 5.1.4 (2022-04-28)
+
+##### Bug Fixes
+
+* **other:**
+  * ensure backward compatibility for alternate dep composite declaration outside of MWP - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([523c2fb2](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/523c2fb23b41594d53e87d7747889889a6c5a3b4))
+
+* * *
+* * *
 ## 5.1.3 (2022-04-28)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -813,14 +813,30 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 
 
-const pkg = configUtils.packages.getPackage('mywp-dummy-eui10-remote-el-ui');
+// const pkg = configUtils.packages.getPackage('mywp-dummy-eui10-remote-el-ui');
+
+// Promise.resolve()
+//   .then(() => {
+//     return metadataUtils.packageHistory.generateDiffReport(pkg);
+//   })
+//   .then((metadata) => {
+//     console.log(metadata);
+//   })
 
 Promise.resolve()
-  .then(() => {
-    return metadataUtils.packageHistory.generateDiffReport(pkg);
-  })
-  .then((metadata) => {
-    console.log(metadata);
-  })
+// getting root composite - dependencies-composite.json content
+.then(() => {
+  const compositeJsonFile = path.join(process.cwd(), 'apps/eui-showcase-dev-guide', 'dependencies-composite.json');
+  var compositeDeps = tools.getJsonFileContent(compositeJsonFile) || {};
+
+  if (compositeDeps.dependencies) {
+    return compositeDeps.dependencies;
+  } else {
+    return compositeDeps;
+  }
+})
+.then((deps) => {
+  console.log(deps);
+})
 
 

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

@@ -138,7 +138,13 @@ module.exports.getCompositeDeps = (
     // getting root composite - dependencies-composite.json content
     .then(() => {
       const compositeJsonFile = path.join(process.cwd(), compositePath, 'dependencies-composite.json');
-      return tools.getJsonFileContent(compositeJsonFile) || {};
+      var compositeDeps = tools.getJsonFileContent(compositeJsonFile) || {};
+
+      if (compositeDeps.dependencies) {
+        return compositeDeps.dependencies;
+      } else {
+        return compositeDeps;
+      }
     })
 
     // getting env specific composite with compositeType if provided

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

@@ -54,7 +54,7 @@ module.exports.storeMetadata = (project, newVersion, envTarget) => {
       }
 
       versions.push({
-        name: newVersion,
+        version: newVersion,
         releaseDate: appReleaseDate,
         envTarget: envTarget
       });

package/scripts/csdr/metadata/package.js

@@ -270,21 +270,6 @@ module.exports.storeMetadata = (
       }
     })
 
-    .then(() => {
-      if (isMaster && pkg.remote) {
-        return innerCommon.generateDiffReport(pkg, pkgVersion);
-      }
-    })
-
-    .then(() => {
-      tools.logTitle('Commiting metadata info');
-      return gitUtils.commitAndPush(
-        'master',
-        `chore: update metadata for ${pkg.name}-${pkgVersion}`,
-        configOptions.DEVOPS_METADATA_PATH
-      );
-    })
-
     .then(() => {
       tools.logSuccess();
     })

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

@@ -9,6 +9,7 @@ const utils = require('../../../utils');
 // CSDR RELATED
 const metadataUtils = require('../../metadata/metadata-utils');
 const versionUtils = require('../../version/version-utils');
+const configUtils = require('../../config/config-utils');
 
 // GLOBAL ARGS
 const { dryRun } = utils.tools.getArgs();
@@ -460,6 +461,63 @@ module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, dur
 }
 
 
+module.exports.generateDiffReport = (pkg, newVersion) => {
+  utils.tools.logBanner('GENERATE DIFF REPORT');
+
+  const branches = this.getBranches();
+
+  return Promise.resolve()
+  .then(() => {
+    return metadataUtils.packageHistory.generateDiffReport(pkg);
+  })
+
+  .then((diffMetadata) => {
+    if (diffMetadata) {
+      return Promise.resolve()
+        .then(() => {
+          return metadataUtils.packageHistory.flattenDiffMetadata(diffMetadata);
+        })
+
+        .then((flatDiffMetadata) => {
+          return utils.notification.package.sendPackageDiffReportMessage(
+            pkg,
+            flatDiffMetadata
+          );
+        })
+
+        .then(() => {
+          return metadataUtils.packageHistory.storeMetadata(pkg, diffMetadata, newVersion);
+        })
+    }
+  })
+
+  .catch((e) => {
+    throw e;
+  })
+}
+
+module.exports.commitMetadata = (pkg, version) => {
+
+  const configOptions = configUtils.global.getConfigOptions();
+
+  return Promise.resolve()
+    .then(() => {
+      utils.tools.logTitle('Commiting metadata info');
+
+      return gitUtils.commitAndPush(
+        'master',
+        `chore: update metadata for ${pkg.name}-${version}`,
+        configOptions.DEVOPS_METADATA_PATH
+      );
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+
 module.exports.exportPipelineVariables = (pkg, compositeType) => {
   utils.tools.logBanner('EXPORT PIPELINE VARIABLES');
 
@@ -504,43 +562,6 @@ module.exports.exportPipelineVariables = (pkg, compositeType) => {
 
 
 
-module.exports.generateDiffReport = (pkg, newVersion) => {
-  utils.tools.logBanner('GENERATE DIFF REPORT');
-
-  const branches = this.getBranches();
-
-  return Promise.resolve()
-  .then(() => {
-    return metadataUtils.packageHistory.generateDiffReport(pkg);
-  })
-
-  .then((diffMetadata) => {
-    if (diffMetadata) {
-      return Promise.resolve()
-        .then(() => {
-          return metadataUtils.packageHistory.flattenDiffMetadata(diffMetadata);
-        })
-
-        .then((flatDiffMetadata) => {
-          return utils.notification.package.sendPackageDiffReportMessage(
-            pkg,
-            flatDiffMetadata
-          );
-        })
-
-        .then(() => {
-          return metadataUtils.packageHistory.storeMetadata(pkg, diffMetadata, newVersion);
-        })
-    }
-  })
-
-  .catch((e) => {
-    throw e;
-  })
-}
-
-
-
 module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
   utils.tools.logBanner('SEND SUCCESS NOTIFICATION');
 

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

@@ -167,13 +167,24 @@ module.exports.run = () => {
         return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
       })
 
+      // STORING PACKAGE HISTORY
+      .then(() => {
+        if (isMaster && pkg.remote) {
+          return innerCommon.generateDiffReport(pkg, pkgVersion);
+        }
+      })
+
+      // COMMITING METADATA
+      .then(() => {
+        return innerCommon.commitMetadata(pkg, pkgVersion);
+      })
+
 
       // EXPORT ADDITIONAL PIPELINE VARIABLES
       .then(() => {
         return innerCommon.exportPipelineVariables(pkg, compositeType);
       })
 
-
       // SEND SUCCESS NOTIFICATION
       .then(() => {
         return innerCommon.sendSuccessNotification(pkg, newVersion, pkgMetadata)

package/scripts/csdr/version/app-common.js

@@ -11,6 +11,23 @@ const tools = require('../../utils/tools');
 const { dryRun } = tools.getArgs();
 
 
+module.exports.getCurrentVersion = (project) => {
+  return Promise.resolve()
+    .then(() => {
+      let version;
+      const pathPkgJson = path.resolve(process.cwd(), project.folder, 'package.json');
+      const pkgJson = require(pathPkgJson);
+      version = pkgJson.version;
+
+      return version;
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
 module.exports.updatePackageVersion = (project, newVersion) => {
   return Promise.resolve()
     .then(() => {

package/scripts/csdr/version/app-default.js

@@ -15,23 +15,6 @@ const tools = require('../../utils/tools');
 const { dryRun } = tools.getArgs();
 
 
-module.exports.getCurrentVersion = (project) => {
-  return Promise.resolve()
-    .then(() => {
-      let version;
-      const pathPkgJson = path.resolve(process.cwd(), project.folder, 'package.json');
-      const pkgJson = require(pathPkgJson);
-      version = pkgJson.version;
-
-      return version;
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
 // for process v1 build, version is updated in the project package.json
 // new version is derived from there
 

package/scripts/csdr/version/app.js

@@ -22,4 +22,4 @@ module.exports.getNewVersion = (project, isSnapshot, isSupportBranch, envTarget)
 
 module.exports.updatePackageVersion = appCommon.updatePackageVersion;
 
-module.exports.getCurrentVersion = appCommon.getCurrentVersion;
+module.exports.getCurrentVersion = appCommon.getCurrentVersion;

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

@@ -98,36 +98,47 @@ module.exports.getNewVersion = (
 
       tools.logInfo(`Current version found : ${currentVersion}`);
 
-      const release = getReleaseType(commits);
-      tools.logInfo('release info found : ' + JSON.stringify(release));
-
       let newVersion = '1.0.0';
 
-      if (isNextBranch) {
-        newVersion = semver.inc(currentVersion, 'prerelease');
-      } else {
-        newVersion = semver.valid(release.releaseType) || semver.inc(currentVersion, release.releaseType)
-      }
+      if (commits) {
+        const release = getReleaseType(commits);
+        tools.logInfo('release info found : ' + JSON.stringify(release));
+
+        if (isNextBranch) {
+          newVersion = semver.inc(currentVersion, 'prerelease');
+        } else {
+          newVersion = semver.valid(release.releaseType) || semver.inc(currentVersion, release.releaseType)
+        }
 
-      tools.logInfo('probable new version : ' + newVersion);
+        tools.logInfo('probable new version : ' + newVersion);
 
-      if (isSnapshot) {
-        if (pkg.backend) {
-          if (pkg.build && pkg.build.nodejs) {
-            newVersion += '-snapshot-' + Date.now();
+        if (isSnapshot) {
+          if (pkg.backend) {
+            if (pkg.build && pkg.build.nodejs) {
+              newVersion += '-snapshot-' + Date.now();
+            } else {
+              newVersion += '-SNAPSHOT';
+            }
           } else {
-            newVersion += '-SNAPSHOT';
+            newVersion += '-snapshot-' + Date.now();
           }
-        } else {
-          newVersion += '-snapshot-' + Date.now();
+
+        } else if (isSupportBranch) {
+          if (pkg.backend) {
+            newVersion = semver.inc(currentVersion, 'prerelease');
+          }
+        } else if (isHotfixBranch) {
+          newVersion = semver.inc(currentVersion, 'prerelease');
         }
 
-      } else if (isSupportBranch) {
-        if (pkg.backend) {
+      } else {
+        tools.logInfo('No commits found for version processing...applying minor version upgrade');
+
+        if (isNextBranch) {
           newVersion = semver.inc(currentVersion, 'prerelease');
+        } else {
+          newVersion = semver.inc(currentVersion, 'minor');
         }
-      } else if (isHotfixBranch) {
-        newVersion = semver.inc(currentVersion, 'prerelease');
       }
 
       tools.logSuccess('new version generated : ' + newVersion);