@eui/tools 5.0.0-rc.10 → 5.0.0-rc.12

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

@@ -20,7 +20,7 @@ module.exports.run = () => {
   const project = configUtils.projects.getProject();
 
   // fetching command parameters
-  var { branch, dryRun, envTarget, compositeType } = utils.tools.getArgs();
+  var { branch, dryRun, envTarget, compositeType, configEnvTarget } = utils.tools.getArgs();
 
   // checking branch and envTarget types
   if (branch && typeof (branch) === 'boolean') {
@@ -29,6 +29,9 @@ module.exports.run = () => {
   if (envTarget && typeof (envTarget) === 'boolean') {
     envTarget = null;
   }
+  if (configEnvTarget && typeof (configEnvTarget) === 'boolean') {
+    configEnvTarget = null;
+  }
 
   // globals
   if (!branch && !envTarget) {
@@ -37,11 +40,13 @@ module.exports.run = () => {
   }
 
   // Getting branch flags
+  var isSupportSnapshotBranch;
   var isSupportBranch;
   var isSnapshot;
 
   if (branch) {
-    isSupportBranch = (branch !== 'master' && branch.indexOf('support/') > -1);
+    isSupportSnapshotBranch = (branch !== 'master' && branch.indexOf('support/develop') > -1);
+    isSupportBranch = (branch !== 'master' && !isSupportSnapshotBranch && branch.indexOf('support/') > -1);
     isSnapshot = (branch !== 'master' && !isSupportBranch);
   }
 
@@ -56,7 +61,7 @@ module.exports.run = () => {
 
     // for traditional app build using develop / master branch
   } else {
-    if (isSnapshot) {
+    if (isSnapshot || isSupportSnapshotBranch) {
       envTargetGen = 'DEV';
     } else {
       envTargetGen = 'TST';
@@ -78,6 +83,9 @@ module.exports.run = () => {
 
   // Starting the release process
   return Promise.resolve()
+    .then(() => {
+      utils.tools.logVersion();
+    })
 
     // *****************************************************************
     // RELEASE PACKAGE START
@@ -142,7 +150,7 @@ module.exports.run = () => {
     .then(() => {
       utils.tools.logTitle('Getting app new version...');
 
-      return versionUtils.app.getNewVersion(project, isSnapshot, isSupportBranch, envTarget);
+      return versionUtils.app.getNewVersion(project, (isSnapshot || isSupportSnapshotBranch), isSupportBranch, envTarget);
     })
     .then((version) => {
       // set the new version found for later use
@@ -196,7 +204,7 @@ module.exports.run = () => {
     // *****************************************************************
     .then(() => {
       // process v1 - diff report is generated on MASTER / TST release
-      if (!isSnapshot && !envTarget) {
+      if (!isSnapshot && !isSupportSnapshotBranch && !envTarget) {
         return metadataUtils.appHistory.generateDiffReport(project, newVersion, isSupportBranch);
       }
 
@@ -253,7 +261,7 @@ module.exports.run = () => {
     // BUILD ANGULAR APPLICATION
     // *****************************************************************
     .then(() => {
-      return utils.buildApp.angular(envTarget, isSnapshot, newVersion);
+      return utils.buildApp.angular(envTarget, (isSnapshot || isSupportSnapshotBranch), newVersion, configEnvTarget);
     })
 
 
@@ -282,7 +290,7 @@ module.exports.run = () => {
       if (project.build && project.build.distribution) {
         return Promise.resolve()
           .then(() => {
-            return utils.buildApp.generateProjectDistributionFile(project, isSnapshot);
+            return utils.buildApp.generateProjectDistributionFile(project, (isSnapshot || isSupportSnapshotBranch));
           })
           .catch((e) => {
             throw e;
@@ -335,7 +343,7 @@ module.exports.run = () => {
     .then(() => {
       // for env-target based builds, no need to merge anything back as it only contains a master branch for sources
       if (!envTarget) {
-        if (!isSnapshot && !isSupportBranch) {
+        if (!isSnapshot && !isSupportBranch && !isSupportSnapshotBranch) {
           return utils.git.mergeMasterToDevelop(project, project.folder);
         }
       }
@@ -357,19 +365,6 @@ module.exports.run = () => {
 
 
 
-    // *****************************************************************
-    // GENERATE VERSION HISTORY PAGE ON CONFLUENCE
-    // *****************************************************************
-    .then(() => {
-      if (envTargetGen !== 'DEV') {
-        return metadataUtils.common.publishMetadata(project);
-      }
-    })
-
-
-
-
-
     // *****************************************************************
     // SEND SLACK SUCCESS
     // *****************************************************************

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

@@ -0,0 +1,26 @@
+'use strict';
+
+// GLOBAL
+const path = require('path');
+
+// LOCAL
+const installUtils = require('../../install/install-utils');
+const configUtils = require('../../config/config-utils');
+
+module.exports.install = (pkg) => {
+  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.install(prj, pkg);
+  })
+
+  .catch((e) => {
+    throw e;
+  })
+}
+

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

@@ -1,6 +1,7 @@
 'use strict';
 
 // GLOBAL
+const path = require('path');
 
 // UTILS
 const utils = require('../../../utils');
@@ -14,14 +15,15 @@ const { dryRun } = utils.tools.getArgs();
 
 
 
-module.exports.getBranches = () => {
+const getBranches = module.exports.getBranches = () => {
   const { branch } = utils.tools.getArgs();
 
   const isSnapshot =  (branch === 'develop');
   const isMaster =  (branch === 'master');
-  const isSupport = (!isMaster && !isSnapshot && branch.indexOf('support/') > -1);
-  const isNext = (!isMaster && !isSnapshot && !isSupport && branch.indexOf('next/') > -1);
-  const isSupportSnapshot = (!isMaster && !isSnapshot && !isSupport && !isNext);
+  const isSupportSnapshot = (!isMaster && !isSnapshot && branch.indexOf('support/develop') > -1);
+  const isSupport = (!isMaster && !isSnapshot && !isSupportSnapshot && branch.indexOf('support/') > -1);
+  const isHotfix = (!isMaster && !isSnapshot && !isSupportSnapshot && !isSupport && branch.indexOf('hotfix/') > -1);
+  const isNext = (!isMaster && !isSnapshot && !isSupport && !isSupportSnapshot && !isHotfix && branch.indexOf('next/') > -1);
 
   return {
     isSupport: isSupport,
@@ -29,12 +31,56 @@ module.exports.getBranches = () => {
     isNext: isNext,
     isSnapshot: isSnapshot,
     isMaster: isMaster,
+    isHotfix: isHotfix,
     branch: branch
   }
 }
 
+module.exports.getEnvTarget = () => {
+  const { envTarget } = utils.tools.getArgs();
+
+  // Initialize composite type
+  if (envTarget && typeof (envTarget) === 'boolean') {
+    envTarget = null;
+  }
+
+  let envTargetGen;
+
+  // when envTarget is provided this take the lead
+  if (envTarget) {
+    envTargetGen = envTarget;
+
+  // otherwise the envTarget is derived from branches develop = DEV/ master = TST
+  } else {
+    const branches = getBranches();
+    if (branches.isSnapshot || branches.isSupportSnapshotBranch) {
+      envTargetGen = 'DEV';
+    } else {
+      envTargetGen = 'TST';
+    }
+  }
+
+  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) => {
+  utils.tools.logBanner('INIT');
 
   const branches = this.getBranches();
 
@@ -71,6 +117,11 @@ module.exports.init = (pkg) => {
     return metadataUtils.common.cloneMetadataRepo();
   })
 
+  // CLONE METADATA LOCKS REPO
+  .then(() => {
+    return metadataUtils.common.cloneMetadataLocksRepo();
+  })
+
   .catch((e) => {
     throw e;
   })
@@ -82,6 +133,8 @@ module.exports.init = (pkg) => {
 
 
 module.exports.preReleaseChecks = (pkg) => {
+  utils.tools.logBanner('PRE-RELEASE checks');
+
   return Promise.resolve()
 
   // GET AND CHECK DEVOPS CONFIG
@@ -112,6 +165,8 @@ module.exports.preReleaseChecks = (pkg) => {
 
 
 module.exports.commitMetadataChecks = (pkg) => {
+  utils.tools.logBanner('COMMIT METADATA CHECKS');
+
   utils.tools.logTitle('Checking package commit metadata');
   let pkgMetadata;
 
@@ -146,6 +201,8 @@ module.exports.commitMetadataChecks = (pkg) => {
 
 
 module.exports.preBuild = (pkg) => {
+  utils.tools.logBanner('PRE-BUILD');
+
   return Promise.resolve()
   .then(() => {
     return utils.buildPackage.preBuild(pkg);
@@ -159,7 +216,8 @@ module.exports.preBuild = (pkg) => {
 
 
 
-module.exports.updateVersion = (pkg, pkgMetadata) => {
+module.exports.updateVersion = (pkg, pkgMetadata, envTarget) => {
+  utils.tools.logBanner('UPDATE VERSION');
 
   // getting branch flags
   const branches = this.getBranches();
@@ -171,7 +229,15 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
 
   // GET NEW VERSION from VALID commits found in metadata
   .then(() => {
-    return versionUtils.package.getNewVersion(pkg, pkgMetadata.commits, branches.isSnapshot, branches.isNext, branches.isSupport);
+    return versionUtils.package.getNewVersion(
+      pkg,
+      pkgMetadata.commits,
+      (branches.isSnapshot || branches.isSupportSnapshot),
+      branches.isNext,
+      branches.isSupport,
+      branches.isHotfix,
+      envTarget
+    );
   })
 
 
@@ -179,9 +245,14 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
   .then((version) => {
     newVersion = version;
 
-    if (!dryRun) {
-      return versionUtils.package.updateVersion(pkg, version, branches.isSnapshot, branches.isNext, branches.isSupport);
-    }
+    return versionUtils.package.updateVersion(
+      pkg,
+      version,
+      (branches.isSnapshot || branches.isSupportSnapshot),
+      branches.isNext,
+      branches.isSupport,
+      branches.isHotfix
+    );
   })
 
   // returning new version generated
@@ -198,6 +269,8 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
 
 
 module.exports.generateChangelog = (pkg, version, pkgMetadata) => {
+  utils.tools.logBanner('GENERATE CHANGELOG');
+
   return Promise.resolve()
 
   // GENERATE CHANGELOG
@@ -232,6 +305,8 @@ module.exports.generateChangelog = (pkg, version, pkgMetadata) => {
 
 
 module.exports.postBuild = (pkg, version) => {
+  utils.tools.logBanner('POST BUILD');
+
   return Promise.resolve()
   // all packages
   .then(() => {
@@ -252,9 +327,26 @@ module.exports.postBuild = (pkg, version) => {
 }
 
 
+module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
+  utils.tools.logBanner('STORE METADATA ASSETS');
+
+  return Promise.resolve()
+    .then(() => {
+      if (pkg.remote) {
+        return metadataUtils.package.storeMetadataAssets(pkg, pkgCompositeDeps);
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
 module.exports.runGitOperations = (pkg, version) => {
+  utils.tools.logBanner('RUN GIT OPERATIONS');
 
   const branches = this.getBranches();
+  console.log(branches);
 
   return Promise.resolve()
   // COMMIT and PUSH UPDATED FILES ON PACKAGE REPOSITORY
@@ -268,7 +360,7 @@ module.exports.runGitOperations = (pkg, version) => {
 
   // TAG THE NEW RELEASE (MASTER) for MASTER and SUPPORT
   .then(() => {
-    if (!branches.isSnapshot) {
+    if (!branches.isSnapshot && !branches.isSupportSnapshot) {
       return utils.git.tagVersion(
         version, branches.branch,
         `chore(release): tagging ${version} - from CI server`,
@@ -280,10 +372,19 @@ module.exports.runGitOperations = (pkg, version) => {
   // MERGE BACK ON DEVELOP for MASTER / LATEST RELEASE
   .then(() => {
     if (branches.isMaster) {
+      utils.tools.logInfo('Branch is master merge back to develop');
       return utils.git.mergeMasterToDevelop(pkg, pkg.paths.pkgDirectory, version);
     }
   })
 
+  // MERGE BACK ON support/develop for support release for package that has a support/develop branch active
+  .then(() => {
+    if (branches.isSupport && pkg.build && pkg.build.supportSnapshotBranch) {
+      utils.tools.logInfo('Branch is support / supportSnapshotBranch config detected');
+      return utils.git.mergeSupportToSupportDevelop(pkg, pkg.paths.pkgDirectory, branches.branch, pkg.build.supportSnapshotBranch);
+    }
+  })
+
   .catch((e) => {
     throw e;
   })
@@ -291,16 +392,19 @@ module.exports.runGitOperations = (pkg, version) => {
 
 
 
-module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, duration) => {
+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.isSnapshot, branches.isMaster, branches.isSupport, branches.isNext, branches.isSupportSnapshot,
+      branches.isSnapshot, branches.isMaster, branches.isSupport, branches.isNext, branches.isSupportSnapshot, branches.isHotfix,
       pkgCompositeDeps,
-      duration
+      duration,
+      envTarget
     );
   })
 
@@ -310,7 +414,44 @@ module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, dur
 }
 
 
+module.exports.exportPipelineVariables = (pkg) => {
+  utils.tools.logBanner('EXPORT PIPELINE VARIABLES');
+
+  return Promise.resolve()
+  .then(() => {
+    if (pkg.remote) {
+      utils.tools.logTitle('Exporting pkg remote variables');
+
+      utils.tools.logInfo('Exporting APP_TARGET');
+
+      let appTarget = 'MWP_ONLY';
+
+      if (pkg.build && pkg.build.appTarget) {
+        appTarget = pkg.build.appTarget;
+      }
+
+      utils.tools.logInfo(`appTarget generated : ${appTarget}`);
+
+      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`);
+      }
+    }
+  })
+
+  .catch((e) => {
+    throw e;
+  })
+}
+
+
+
+
 module.exports.generateDiffReport = (pkg, newVersion) => {
+  utils.tools.logBanner('GENERATE DIFF REPORT');
+
   const branches = this.getBranches();
 
   return Promise.resolve()
@@ -346,6 +487,8 @@ module.exports.generateDiffReport = (pkg, newVersion) => {
 
 
 module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
+  utils.tools.logBanner('SEND SUCCESS NOTIFICATION');
+
   return Promise.resolve()
   .then(() => {
     utils.tools.logTitle('Sending slack success');
@@ -381,6 +524,10 @@ module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
 
 
 module.exports.sendErrorNotification = (pkg, exception, pkgMetadata) => {
+  utils.tools.logBanner('SEND ERROR NOTIFICATION');
+
+  // console.log(pkgMetadata);
+
   return Promise.resolve()
   .then(() => {
     utils.tools.logTitle('ERROR !!!!! an unexpected error occured....');

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

@@ -14,6 +14,7 @@ const metadataUtils = require('../../metadata/metadata-utils');
 const innerCommon = require('./common');
 const innerUi = require('./ui');
 const innerRemote = require('./remote');
+const innerBackend = require('./backend');
 
 
 module.exports.run = () => {
@@ -30,12 +31,22 @@ module.exports.run = () => {
     // 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;
 
 
-
     return Promise.resolve()
+      .then(() => {
+        utils.tools.logVersion();
+      })
+
 
       // RELEASE PACKAGE START
       .then(() => {
@@ -74,10 +85,13 @@ module.exports.run = () => {
       // INSTALL dependencies by type
       .then(() => {
         if (pkg.remote) {
-          return innerRemote.install(pkg, branches.isMaster);
+          return innerRemote.install(pkg, envTarget, compositeType);
+
+        } else if (pkg.backend) {
+          return innerBackend.install(pkg);
 
         } else {
-          return innerUi.install(pkg, branches.isMaster);
+          return innerUi.install(pkg);
         }
       })
       .then((compositeDeps) => {
@@ -100,7 +114,7 @@ module.exports.run = () => {
 
       // GENERATE and UPDATE new version
       .then(() => {
-        return innerCommon.updateVersion(pkg, pkgMetadata);
+        return innerCommon.updateVersion(pkg, pkgMetadata, envTarget);
       })
       .then((version) => {
         // storing version for later use
@@ -122,6 +136,12 @@ module.exports.run = () => {
       })
 
 
+      // STORING METADATA ASSETS
+      .then(() => {
+        return innerCommon.storeMetadataAssets(pkg, pkgCompositeDeps);
+      })
+
+
       // PUBLISH PACKAGE
       .then(() => {
         return utils.publish.publish(pkg);
@@ -144,7 +164,7 @@ module.exports.run = () => {
       .then(() => {
         // get run duration
         const duration = utils.pipeline.getTimerDuration();
-        return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration);
+        return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
       })
 
 
@@ -156,6 +176,12 @@ module.exports.run = () => {
       })
 
 
+      // EXPORT ADDITIONAL PIPELINE VARIABLES
+      .then(() => {
+        return innerCommon.exportPipelineVariables(pkg);
+      })
+
+
       // SEND SUCCESS NOTIFICATION
       .then(() => {
         return innerCommon.sendSuccessNotification(pkg, newVersion, pkgMetadata)

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

@@ -2,42 +2,27 @@
 
 // GLOBAL
 const path = require('path');
-
-// LOCAL
 const installUtils = require('../../install/install-utils');
-const configUtils = require('../../config/config-utils');
-const auditUtils = require('../../audit/audit-utils');
-
 
-module.exports.install = (pkg, isMaster) => {
+module.exports.install = (pkg, envTarget, compositeType) => {
   var pkgCompositeDeps = {};
 
   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.install(prj, pkg, isMaster);
+    return installUtils.buildPackage.installRemote(pkg, envTarget, compositeType);
   })
   .then((compositeDeps) => {
     // save composite deps for later exports
     pkgCompositeDeps = compositeDeps;
   })
 
-
-  // AUDIT DEPENDENCIES
-  .then(() => {
-    return auditUtils.audit(pkg);
-  })
-
   .then(() => {
     return pkgCompositeDeps;
   })
 
-
   .catch((e) => {
     throw e;
   })