@eui/tools 5.2.7 → 5.2.8

package/.version.properties

@@ -1 +1 @@
-5.2.7
+5.2.8

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 5.2.8 (2022-05-16)
+
+##### Bug Fixes
+
+* **other:**
+  * add logging of deps from current env if compositeType provided - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([9132b579](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/9132b57958eea09219e3d212d112c243f892ba44))
+  * envTarget composite fix - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([127f4656](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/127f46568a51dc26da767c08425519777908553c))
+
+* * *
+* * *
 ## 5.2.7 (2022-05-13)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -843,24 +843,26 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 // METADATA ESTING
 // --------------------
 const pkg = configUtils.packages.getPackage('cc-task-details-eui10-remote-el-ui');
-const envTarget = 'DEV';
+const envTarget = 'INT';
 
 let versionsMetadata, envsMetadata;
 
 Promise.resolve()
-  // generating new version based on the env target and the envs cycle type
+  // .then(() => {
+  //   return installUtils.remotes.getDeps(pkg, envTarget, 'regio');
+  // })
+  // .then((deps) => {
+  //   console.log(deps);
+  // })
   .then(() => {
-    return versionUtils.packageRemote.getNewVersion(pkg, envTarget);
-  })
-  .then((version) => {
-    console.log(version);
+    // return versionUtils.packageRemote.getNewVersion(pkg, envTarget);
+    return metadataUtils.packageHistory.generateDiffReport(pkg, envTarget);
   })
 
 
 
 
 
-
 // const pkg = configUtils.packages.getPackage('opsys-epc-esub-bo-ui', true);
 
 // Promise.resolve()

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

@@ -109,6 +109,10 @@ const getCompositeDepsByEnv = (compositePath, envTarget, compositeType, envsMeta
       const compositeFile = path.join(process.cwd(), compositePath, `dependencies-composite-${envTarget}-${compositeType}.json`);
       const fileDeps = tools.getJsonFileContent(compositeFile).lockedDependencies || {};
       console.log(JSON.stringify(fileDeps, null, 2));
+
+      tools.logInfo(`Current deps found for ${envTarget}:`);
+      console.log(JSON.stringify(currentEnvDeps, null, 2));
+
       return { ...currentEnvDeps, ...fileDeps };
     })
     .catch((e) => {

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

@@ -206,13 +206,57 @@ const getDiffBetweenBuildVersions = (pkg, fromBuildMetadata, toBuildMetadata) =>
 
 
 
+const getDiffByEnvTarget = (pkg, envTarget) => {
+  return Promise.resolve()
+    .then(() => {
+      return innerPackage.getPackageVersionsLatest(pkg);
+    })
+
+    .then((pkgVersions) => {
+      const envVersions = pkgVersions.filter((v) => {
+        return v.envTarget === envTarget
+      });
+
+      const fromVersion = envVersions[envVersions.length - 2];
+      const toVersion = envVersions[envVersions.length - 1];
+      const hasHistory = fromVersion && toVersion;
+
+      if (!fromVersion || !toVersion) {
+        tools.logWarning('WARNING: could not find versions matching for generating diff report');
+        return;
+      } else {
+        return getDiffBetweenBuildVersions(pkg, fromVersion, toVersion, hasHistory);
+      }
+
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+
 
 // get differences of package versions between last(current) and previous major
 
-const generateDiffReport = (pkg, fromVersion, toVersion) => {
+const generateDiffReport = (pkg, envTarget, fromVersion, toVersion) => {
   tools.logTitle('Generate packages differences report from previous major version...');
 
-  return Promise.resolve()
+  if (envTarget && pkg.build && pkg.build.envTargetActive) {
+
+    return Promise.resolve()
+    .then(() => {
+      return getDiffByEnvTarget(pkg, envTarget);
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+
+
+  } else {
+    return Promise.resolve()
     .then(() => {
       return innerPackage.getPackageVersionsLatest(pkg);
     })
@@ -237,6 +281,7 @@ const generateDiffReport = (pkg, fromVersion, toVersion) => {
     .catch((e) => {
       throw e;
     })
+  }
 }
 
 

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

@@ -465,11 +465,16 @@ module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, dur
 module.exports.generateDiffReport = (pkg, newVersion) => {
   utils.tools.logBanner('GENERATE DIFF REPORT');
 
-  const branches = this.getBranches();
+  var { envTarget } = utils.tools.getArgs();
+
+  // Initialize composite type
+  if (envTarget && typeof (envTarget) === 'boolean') {
+    envTarget = null;
+  }
 
   return Promise.resolve()
   .then(() => {
-    return metadataUtils.packageHistory.generateDiffReport(pkg);
+    return metadataUtils.packageHistory.generateDiffReport(pkg, envTarget);
   })
 
   .then((diffMetadata) => {