@eui/tools 6.14.20 → 6.15.0

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

@@ -17,7 +17,11 @@ const { dryRun, pipelineId } = utils.tools.getArgs();
 
 
 const getBranches = module.exports.getBranches = () => {
-  const { branch } = utils.tools.getArgs();
+  let { branch } = utils.tools.getArgs();
+
+  if (!branch) {
+    branch = 'master';
+  }
 
   const isSnapshot =  (branch === 'develop');
   const isMaster =  (branch === 'master');
@@ -45,7 +49,7 @@ const getBranches = module.exports.getBranches = () => {
 }
 
 module.exports.getEnvTarget = () => {
-  var { envTarget } = utils.tools.getArgs();
+  let { envTarget } = utils.tools.getArgs();
 
   // Initialize composite type
   if (envTarget && typeof (envTarget) === 'boolean') {
@@ -71,23 +75,8 @@ module.exports.getEnvTarget = () => {
   return envTargetGen;
 }
 
-module.exports.getCompositeType = () => {
-  let { compositeType } = utils.tools.getArgs();
-
-  // Initialize composite type
-  if (compositeType && typeof (compositeType) === 'boolean') {
-    compositeType = null;
-  }
-
-  if (!compositeType) {
-    compositeType = 'DEFAULT';
-  }
-
-  return compositeType;
-}
-
 
-module.exports.init = (pkg, envTarget, compositeType) => {
+module.exports.init = (pkg, envTarget) => {
   utils.tools.logBanner('INIT');
 
   const branches = this.getBranches();
@@ -95,12 +84,12 @@ module.exports.init = (pkg, envTarget, compositeType) => {
   // checking if at least the branch has been given as a parameter
   if (!branches.branch) {
     utils.tools.logError('ERROR : "branch" NOT PROVIDED as argument !!!');
-    throw 'BRANCH_NOT_PROVIDED';
+    throw new Error('BRANCH_NOT_PROVIDED');
 
   // for envTarget / à la carte remote delivery, only master branch is allowed
   } else {
     if (pkg.remote && pkg.build && pkg.build.envTargetActive && !branches.isMaster) {
-      throw 'REMOTE_ENVTARGET_NOT_MASTER_BRANCH';
+      throw new Error('REMOTE_ENVTARGET_NOT_MASTER_BRANCH');
     }
   }
 
@@ -124,7 +113,7 @@ module.exports.init = (pkg, envTarget, compositeType) => {
       let launchMessage = ':arrow_forward: :arrow_forward: :arrow_forward: :arrow_forward: :arrow_forward:';
 
       if (pkg.remote) {
-        launchMessage += ` Launching remote *${pkg.name}* release for ENV: *${envTarget}* - compositeType: *${compositeType}*`;
+        launchMessage += ` Launching remote *${pkg.name}* release for ENV: *${envTarget}*`;
       } else {
         launchMessage += ` Launching *${pkg.name}* release for branch *${branches.branch}*`;
       }
@@ -198,7 +187,7 @@ module.exports.preReleaseChecks = (pkg) => {
 
     if (!branches.valid) {
       utils.tools.logInfo('Branch not supported ... stopping : allowed branches are develop-master-next/-support/-hotfix/');
-      throw 'BRANCH_NOT_SUPPORTED';
+      throw new Error('BRANCH_NOT_SUPPORTED');
 
     } else {
       utils.tools.logInfo('Branch is valid... processing');
@@ -216,13 +205,13 @@ module.exports.preReleaseChecks = (pkg) => {
 
       } else {
         // if package is locked, exception is thrown, check this specific exception handling in the global catch
-        if (metadataUtils.package.isPackageLocked(pkg)) {
+        if (metadataUtils.packageUtils.isPackageLocked(pkg)) {
           utils.tools.logInfo('Package is locked ==> throwing exception');
           throw 'PACKAGE_LOCKED';
 
           // if package is not locked, we lock it
         } else {
-          return metadataUtils.package.lockPackage(pkg);
+          return metadataUtils.packageUtils.lockPackage(pkg);
         }
       }
     }
@@ -408,9 +397,7 @@ module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
 
   return Promise.resolve()
     .then(() => {
-      if (pkg.remote) {
-        return metadataUtils.package.storeMetadataAssets(pkg, pkgCompositeDeps);
-      }
+      return metadataUtils.remotePackage.storeMetadataAssets(pkg, pkgCompositeDeps);
     })
 
     .catch((e) => {
@@ -506,90 +493,6 @@ module.exports.runGitOperations = (pkg, version) => {
 
 
 
-module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, duration, envTarget) => {
-  utils.tools.logBanner('STORE METADATA');
-
-  const branches = this.getBranches();
-
-  return Promise.resolve()
-  .then(() => {
-    return metadataUtils.package.storeMetadata(
-      pkg, version, pkgMetadata,
-      branches,
-      pkgCompositeDeps,
-      duration,
-      envTarget,
-    );
-  })
-
-  .catch((e) => {
-    throw e;
-  })
-}
-
-
-
-module.exports.storeMetadataBackend = (pkg, version, pkgMetadata, duration, envTarget) => {
-  utils.tools.logBanner('STORE BACKEND METADATA');
-
-  const branches = this.getBranches();
-
-  return Promise.resolve()
-  .then(() => {
-    return metadataUtils.package.storeMetadataBackend(
-      pkg, version, pkgMetadata,
-      branches.isMaster,
-      duration,
-      envTarget
-    );
-  })
-
-  .catch((e) => {
-    throw e;
-  })
-}
-
-
-module.exports.generateDiffReport = (pkg, newVersion) => {
-  utils.tools.logBanner('GENERATE DIFF REPORT');
-
-  var { envTarget } = utils.tools.getArgs();
-
-  // Initialize composite type
-  if (envTarget && typeof (envTarget) === 'boolean') {
-    envTarget = null;
-  }
-
-  return Promise.resolve()
-  .then(() => {
-    return metadataUtils.packageHistory.generateDiffReport(pkg, envTarget);
-  })
-
-  .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();
@@ -612,7 +515,7 @@ module.exports.commitMetadata = (pkg, version) => {
 
 
 
-module.exports.exportPipelineVariables = (pkg, compositeType) => {
+module.exports.exportPipelineVariables = (pkg) => {
   utils.tools.logBanner('EXPORT PIPELINE VARIABLES');
 
   let variablesContent = '';
@@ -630,13 +533,10 @@ module.exports.exportPipelineVariables = (pkg, compositeType) => {
     }
 
     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`;
-    }
+    utils.tools.logInfo(`Exporting COMPOSITE_TYPE : DEFAULT`);
+    variablesContent += `export COMPOSITE_TYPE=DEFAULT\n`;
 
     if (dryRun) {
       utils.tools.logWarning('dryRun...skipping export');
@@ -691,7 +591,7 @@ module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
           if (pkg.build && pkg.build.skipLock) {
             utils.tools.logInfo('lock package de-activated...skipping');
           } else {
-            return metadataUtils.package.unlockPackage(pkg);
+            return metadataUtils.packageUtils.unlockPackage(pkg);
           }
         })
         .catch((e) => {
@@ -734,7 +634,7 @@ module.exports.sendErrorNotification = (pkg, exception, pkgMetadata) => {
             if (pkg.build && pkg.build.skipLock) {
               utils.tools.logInfo('lock package de-activated...skipping');
             } else {
-              return metadataUtils.package.unlockPackage(pkg);
+              return metadataUtils.packageUtils.unlockPackage(pkg);
             }
           })
           .catch((e) => {

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

@@ -31,12 +31,8 @@ module.exports.run = () => {
     // Get envTarget (used by remotes)
     const envTarget = innerCommon.getEnvTarget();
 
-    // Get compositeType (used by remotes)
-    const compositeType = innerCommon.getCompositeType();
-
-
     // local saved vars
-    var newVersion, pkgMetadata, pkgCompositeDeps;
+    let newVersion, pkgMetadata;
 
 
     return Promise.resolve()
@@ -123,7 +119,12 @@ module.exports.run = () => {
       .then(() => {
         // get run duration
         const duration = utils.pipeline.getTimerDuration();
-        return innerCommon.storeMetadataBackend(pkg, newVersion, pkgMetadata, duration, envTarget);
+        return metadataUtils.backend.storeMetadataBackend(
+          pkg, newVersion, pkgMetadata,
+          branches.isMaster,
+          duration,
+          envTarget
+        );
       })
 
 

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

@@ -37,9 +37,6 @@ module.exports.run = () => {
     // Get envTarget (used by remotes)
     const envTarget = innerCommon.getEnvTarget();
 
-    // Get compositeType (used by remotes)
-    const compositeType = innerCommon.getCompositeType();
-
     // local saved vars
     let newVersion, pkgMetadata, pkgCompositeDeps;
 
@@ -48,7 +45,7 @@ module.exports.run = () => {
 
       // RELEASE PACKAGE START
       .then(() => {
-        return innerCommon.init(pkg, envTarget, compositeType);
+        return innerCommon.init(pkg, envTarget);
       })
 
       // FOR UI and REMOTES clone metadata repositories
@@ -90,7 +87,7 @@ module.exports.run = () => {
           // FETCHING CURRENT PACKAGES & INSTALL
           .then(() => {
             // install the dependencies for current package build
-            return installUtils.buildPackage.installRemote(pkg, envTarget, compositeType);
+            return installUtils.buildPackage.installRemote(pkg, envTarget);
           })
           .then((compositeDeps) => {
             // storing for later use
@@ -117,7 +114,6 @@ module.exports.run = () => {
       })
 
 
-
       // EXECUTING GLOBAL POST BUILD
       .then(() => {
         return innerCommon.postBuild(pkg, newVersion);
@@ -142,33 +138,18 @@ module.exports.run = () => {
       })
 
 
-
       // GIT OPERATIONS
       .then(() => {
         return innerCommon.runGitOperations(pkg, newVersion);
       })
 
-      // STORING CENTRALIZED METADATA
-      .then(() => {
-        // get run duration
-        const duration = utils.pipeline.getTimerDuration();
-        if (branches.isMaster) {
-          return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
-        }
-      })
-
-      // COMMITING METADATA
-      .then(() => {
-        if (branches.isMaster) {
-          return innerCommon.commitMetadata(pkg, newVersion);
-        }
-      })
 
       // EXPORT ADDITIONAL PIPELINE VARIABLES
       .then(() => {
-        return innerCommon.exportPipelineVariables(pkg, compositeType);
+        return innerCommon.exportPipelineVariables(pkg);
       })
 
+
       // SEND SUCCESS NOTIFICATION
       .then(() => {
         return innerCommon.sendSuccessNotification(pkg, newVersion, pkgMetadata)

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

@@ -17,7 +17,7 @@ module.exports.run = () => {
   // npm run pkg:release mywp-dashboard-eui15-remote-el-ui -- --dryRun --branch master --envTarget DEV --skipInstall --debug --build
 
   // normal UI package / old style remote
-  // npm run pkg:release eui-tools -- --dryRun --branch master --skipLint --skipInstall --skipTest --skipDoc --skipClone --skipAudit --debug --debugNotification --build --ci --pipelineId 99999
+  // npm run pkg:release mywp-shell-ui -- --dryRun --branch master --skipLint --skipInstall --skipTest --skipDoc --skipClone --skipAudit --debug --debugNotification --build --ci --pipelineId 99999
 
 
   return Promise.resolve()

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

@@ -16,7 +16,7 @@ const installUtils = require('../../install/install-utils');
 const innerCommon = require('./common');
 
 // ARGS
-const { skipAudit } = utils.tools.getArgs();
+const { skipInstall, skipAudit } = utils.tools.getArgs();
 
 
 module.exports.run = () => {
@@ -37,18 +37,15 @@ module.exports.run = () => {
     // Get envTarget (used by remotes)
     const envTarget = innerCommon.getEnvTarget();
 
-    // Get compositeType (used by remotes)
-    const compositeType = innerCommon.getCompositeType();
-
     // local saved vars
-    let newVersion, pkgMetadata, pkgCompositeDeps;
+    let newVersion, commitsMetadata;
 
 
     return Promise.resolve()
 
       // RELEASE PACKAGE START
       .then(() => {
-        return innerCommon.init(pkg, envTarget, compositeType);
+        return innerCommon.init(pkg, envTarget);
       })
 
       // FOR UI and REMOTES clone metadata repositories
@@ -66,7 +63,7 @@ module.exports.run = () => {
         return metadataUtils.commit.getMetadata(pkg);
       })
       .then((metadata) => {
-        pkgMetadata = metadata;
+        commitsMetadata = metadata;
       })
 
       // COMMIT METADATA CHECKS
@@ -74,7 +71,7 @@ module.exports.run = () => {
         return innerCommon.commitMetadataChecks(pkg);
       })
       .then((metadata) => {
-        pkgMetadata = metadata;
+        commitsMetadata = metadata;
       })
 
 
@@ -86,25 +83,27 @@ module.exports.run = () => {
 
       // INSTALL dependencies by type
       .then(() => {
-        return Promise.resolve()
-          // FETCHING CURRENT PACKAGES & INSTALL
-          .then(() => {
-            // fetch related project if passed as arguments
-            const prj = configUtils.projects.getProject();
-
-            // install the dependencies for current package build
-            return installUtils.buildPackage.installPackage(prj, pkg, branches.isMaster);
-          })
-
-          // AUDIT DEPENDENCIES
-          .then(() => {
-            if (!skipAudit) {
-              return auditUtils.yarn.audit(pkg);
-            }
-          })
-          .catch((e) => {
-            throw e;
-          })
+        if (!skipInstall) {
+          return Promise.resolve()
+            // FETCHING CURRENT PACKAGES & INSTALL
+            .then(() => {
+              // fetch related project if passed as arguments
+              const prj = configUtils.projects.getProject();
+
+              // install the dependencies for current package build
+              return installUtils.buildPackage.installPackage(prj, pkg, branches.isMaster);
+            })
+
+            // AUDIT DEPENDENCIES
+            .then(() => {
+              if (!skipAudit) {
+                return auditUtils.yarn.audit(pkg);
+              }
+            })
+            .catch((e) => {
+              throw e;
+            })
+        }
       })
 
 
@@ -122,7 +121,7 @@ module.exports.run = () => {
 
       // GENERATE and UPDATE new version
       .then(() => {
-        return innerCommon.updateVersion(pkg, pkgMetadata, envTarget);
+        return innerCommon.updateVersion(pkg, commitsMetadata);
       })
       .then((version) => {
         // storing version for later use
@@ -132,7 +131,7 @@ module.exports.run = () => {
 
       // GENERATE CHANGELOG
       .then(() => {
-        return innerCommon.generateChangelog(pkg, newVersion, pkgMetadata);
+        return innerCommon.generateChangelog(pkg, newVersion, commitsMetadata);
       })
 
 
@@ -154,31 +153,15 @@ module.exports.run = () => {
       })
 
 
-
       // GIT OPERATIONS
       .then(() => {
         return innerCommon.runGitOperations(pkg, newVersion);
       })
 
-      // STORING CENTRALIZED METADATA
-      .then(() => {
-        // get run duration
-        const duration = utils.pipeline.getTimerDuration();
-        if (branches.isMaster) {
-          return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
-        }
-      })
-
-      // COMMITING METADATA
-      .then(() => {
-        if (branches.isMaster) {
-          return innerCommon.commitMetadata(pkg, newVersion);
-        }
-      })
 
       // SEND SUCCESS NOTIFICATION
       .then(() => {
-        return innerCommon.sendSuccessNotification(pkg, newVersion, pkgMetadata)
+        return innerCommon.sendSuccessNotification(pkg, newVersion, commitsMetadata)
           .then(() => {
             return innerCommon.close(pkg);
           });
@@ -186,7 +169,7 @@ module.exports.run = () => {
 
       // SEND ERROR NOTIFICATION
       .catch((e) => {
-        return innerCommon.sendErrorNotification(pkg, e, pkgMetadata)
+        return innerCommon.sendErrorNotification(pkg, e, commitsMetadata)
           .then(() => {
             return innerCommon.close(pkg);
           })

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

@@ -9,12 +9,13 @@ const utils = require('../../../utils');
 // CSDR RELATED
 const configUtils = require('../../config/config-utils');
 const installUtils = require('../../install/install-utils');
+const versionUtils = require('../../version/version-utils');
+const metadataUtils = require('../../metadata/metadata-utils');
 
 // INNER MODULES
 const innerCommon = require('./common');
 
 
-
 module.exports.run = () => {
     utils.tools.logBanner('Starting virtual remote pipeline');
 
@@ -27,25 +28,18 @@ module.exports.run = () => {
       process.exit(1);
     }
 
-    // Get branches flags
-    const branches = innerCommon.getBranches();
-
     // Get envTarget (used by remotes)
     const envTarget = innerCommon.getEnvTarget();
 
-    // Get compositeType (used by remotes)
-    const compositeType = innerCommon.getCompositeType();
-
-
     // local saved vars
-    var newVersion, pkgMetadata, pkgCompositeDeps;
+    let newVersion, pkgCompositeDeps;
 
 
     return Promise.resolve()
 
       // RELEASE PACKAGE START
       .then(() => {
-        return innerCommon.init(pkg, envTarget, compositeType);
+        return innerCommon.init(pkg, envTarget);
       })
 
       // FOR UI and REMOTES clone metadata repositories
@@ -62,7 +56,7 @@ module.exports.run = () => {
 
       // INSTALL dependencies by type
       .then(() => {
-        return installUtils.buildPackage.installRemote(pkg, envTarget, compositeType);
+        return installUtils.buildPackage.installRemote(pkg, envTarget);
       })
       .then((compositeDeps) => {
         // storing for later use
@@ -76,9 +70,9 @@ module.exports.run = () => {
       })
 
 
-      // GENERATE and UPDATE new version
+      // GET REMOTE NEW VERSION
       .then(() => {
-        return innerCommon.updateVersion(pkg, pkgMetadata, envTarget);
+        return versionUtils.packageRemote.getNewVersion(pkg, envTarget);
       })
       .then((version) => {
         // storing version for later use
@@ -114,14 +108,46 @@ module.exports.run = () => {
       .then(() => {
         // get run duration
         const duration = utils.pipeline.getTimerDuration();
-        return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
+
+        // store envs + versions for virtual remotes
+        return metadataUtils.remotePackage.storeMetadata(pkg, newVersion, pkgCompositeDeps, duration, envTarget);
       })
 
-      // STORING PACKAGE HISTORY
+
+      // GENERATE DIFF REPORT
       .then(() => {
-        return innerCommon.generateDiffReport(pkg, newVersion);
+        let metadata;
+
+        if (envTarget !== 'DEV') {
+          return Promise.resolve()
+            .then(() => {
+              return metadataUtils.remoteHistory.generateDiffCommitsMetadataReport(pkg, envTarget);
+            })
+            .then((output) => {
+              metadata = output;
+            })
+            .then(() => {
+              return utils.notification.package.sendPackageDiffReportMessage(
+                pkg,
+                metadata.diffsMetadata
+              );
+            })
+            .then(() => {
+              return metadataUtils.remoteHistory.storeMetadataHistory(pkg, metadata, newVersion);
+            })
+            .then(() => {
+              if (metadata.commitsMetadata && metadata.commitsMetadata.issues) {
+                return metadataUtils.remoteHistory.generatePipelineIssuesList(metadata.commitsMetadata.issues);
+              }
+            })
+            .catch((e) => {
+              tools.logError('Error generating diffs report for current remote processed :');
+              console.log(e);
+            })
+          }
       })
 
+
       // COMMITING METADATA
       .then(() => {
         return innerCommon.commitMetadata(pkg, newVersion);
@@ -130,12 +156,12 @@ module.exports.run = () => {
 
       // EXPORT ADDITIONAL PIPELINE VARIABLES
       .then(() => {
-        return innerCommon.exportPipelineVariables(pkg, compositeType);
+        return innerCommon.exportPipelineVariables(pkg);
       })
 
       // SEND SUCCESS NOTIFICATION
       .then(() => {
-        return innerCommon.sendSuccessNotification(pkg, newVersion, pkgMetadata)
+        return innerCommon.sendSuccessNotification(pkg, newVersion)
           .then(() => {
             return innerCommon.close(pkg);
           });
@@ -143,7 +169,7 @@ module.exports.run = () => {
 
       // SEND ERROR NOTIFICATION
       .catch((e) => {
-        return innerCommon.sendErrorNotification(pkg, e, pkgMetadata)
+        return innerCommon.sendErrorNotification(pkg, e)
           .then(() => {
             return innerCommon.close(pkg);
           })

package/scripts/csdr/version/common.js

@@ -38,8 +38,6 @@ const getNewVersionForDev = (versionsMetadata, envsMetadata, rootEnv, currentVer
       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];

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

@@ -10,8 +10,6 @@ const metadataUtils = require('../metadata/metadata-utils');
 const innerCommon = require('./common');
 const innerPackageCommon = require('./package-common');
 
-// constants
-const { dryRun } = tools.getArgs();
 
 
 // for env-based build, we take the latest TST release version as the base
@@ -31,7 +29,7 @@ module.exports.getNewVersion = (pkg, envTarget) => {
 
     // fetch versions history and store
     .then(() => {
-      return metadataUtils.packageVersions.getMetadata(pkg);
+      return metadataUtils.remotePackage.getMetadataVersions(pkg);
     })
     .then((metadata) => {
       versionsMetadata = metadata;
@@ -39,7 +37,7 @@ module.exports.getNewVersion = (pkg, envTarget) => {
 
     // fetch envs metadata and store
     .then(() => {
-      return metadataUtils.packageEnvs.getMetadata(pkg);
+      return metadataUtils.remotePackage.getMetadataEnvs(pkg);
     })
     .then((metadata) => {
       envsMetadata = metadata;