@eui/tools 6.3.45 → 6.4.0

package/.version.properties

@@ -1 +1 @@
-6.3.45
+6.4.0

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 6.4.0 (2023-02-22)
+
+##### Chores
+
+* **other:**
+  * cleanup teams token - EUI-7146 [EUI-7146](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7146)  ([8b7658d4](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/8b7658d41d48ddc4e6bd90df1c909a436969641c))
+##### New Features
+
+* **other:**
+  * refactor to handle ms teams notification - EUI-7146 [EUI-7146](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7146)  ([2cefe68d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2cefe68d356a1d9b5106d3ea2e1cb5bc1b910da4))
+
+* * *
+* * *
+## 6.3.46 (2023-02-21)
+
+##### Chores
+
+* **other:**
+  * added block container for dynamically handle conditional block generation for v15 remotes - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([63126feb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/63126feb485893f0092fc5fa9e85fe7a5215678a))
+
+* * *
+* * *
 ## 6.3.45 (2023-02-21)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.3.45",
+    "version": "6.4.0",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -41,7 +41,7 @@
         "mocha": "10.2.0",
         "chai": "4.3.7",
         "nyc": "15.1.0",
-        "node-fetch": "3.3.0",
+        "node-fetch": "2.6.9",
         "sendmail": "1.6.1",
         "svg-sprite": "2.0.2",
         "imagemin": "7.0.1",

package/sandbox.js

@@ -1167,17 +1167,22 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //     console.log(remotes);
 //   })
 
-const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
+// const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
+
+
+// Promise.resolve()
+//   .then(() => {
+//     return installUtils.projects.getLocalProjectRemoteDeps(prj);
+//   })
+//   .then((deps) => {
+//     return installUtils.projects.importLocalProjectRemotes(prj, deps);
+//   })
+//   .then(() => {
+//   })
 
 
 Promise.resolve()
   .then(() => {
-    return installUtils.projects.getLocalProjectRemoteDeps(prj);
+    const config = configUtils.global.getConfigOptions();
+    console.log(config);
   })
-  .then((deps) => {
-    return installUtils.projects.importLocalProjectRemotes(prj, deps);
-  })
-  .then(() => {
-  })
-
-

package/scripts/csdr/config/global.js

@@ -222,11 +222,20 @@ module.exports.getConfigOptions = () => {
     NPM_REGISTRY_DEFAULT: null,
     NPM_REGISTRY_DEFAULT_2: null,
     NPM_REGISTRY_INSTALL: null,
+    NPM_FIXED_DEPENDENCIES: null,
     SONAR_HOST: null,
+    NOTIFICATION_CLIENT: null,
     SLACK_HOOK: null,
     SLACK_CHANNEL_FRONTEND: null,
     SLACK_CHANNEL_BACKEND: null,
     SLACK_CHANNEL_PROJECT: null,
+    MAIL_ADDRESS_FRONTEND: null,
+    MAIL_ADDRESS_BACKEND: null,
+    MAIL_ADDRESS_PROJECT: null,
+    MSTEAMS_HOST: null,
+    MSTEAMS_FRONTEND_CHANNEL: null,
+    MSTEAMS_BACKEND_CHANNEL: null,
+    MSTEAMS_PROJECT_CHANNEL: null,
     API_HOST: null,
     AUDIT_DEPENDENCIES_GATES: null,
   }
@@ -270,6 +279,9 @@ module.exports.getConfigOptions = () => {
     if (npm.registry && npm.registry.default2) {
       configOptions.NPM_REGISTRY_DEFAULT_2 = npm.registry.default2;
     }
+    if (npm.fixedDependencies) {
+      configOptions.NPM_FIXED_DEPENDENCIES = npm.fixedDependencies;
+    }
   }
 
   // getting sonar options
@@ -280,60 +292,37 @@ module.exports.getConfigOptions = () => {
     }
   }
 
-  // getting slack options
-  const slack = config && config.slack;
-
-  if (slack) {
-    if (slack.host && slack.hookToken) {
-      configOptions.SLACK_HOOK = slack.host + '/' + slack.hookToken;
-    }
-    if (slack.channels) {
-      if (slack.channels.frontend) {
-        configOptions.SLACK_CHANNEL_FRONTEND = slack.channels.frontend;
-      }
-      if (slack.channels.backend) {
-        configOptions.SLACK_CHANNEL_BACKEND = slack.channels.backend;
-      }
-      if (slack.channels.project) {
-        configOptions.SLACK_CHANNEL_PROJECT = slack.channels.project;
-      }
-    }
-
-  }
-
   // getting notification options (replacing slack only above)
   const notification = config && config.notification;
 
-  configOptions.notification = {};
-
   if (notification) {
     if (notification.defaultClient) {
-      configOptions.notification.CLIENT = notification.defaultClient;
+      configOptions.NOTIFICATION_CLIENT = notification.defaultClient;
     }
 
     const slack = notification.slack;
 
     if (slack) {
       if (slack.host && slack.hookToken) {
-        configOptions.notification.SLACK_HOOK = slack.host + '/' + slack.hookToken;
+        configOptions.SLACK_HOOK = slack.host + '/' + slack.hookToken;
       }
       if (slack.channels) {
         if (slack.channels.frontend) {
-          configOptions.notification.SLACK_CHANNEL_FRONTEND = slack.channels.frontend;
+          configOptions.SLACK_CHANNEL_FRONTEND = slack.channels.frontend;
         } else {
-          configOptions.notification.SLACK_CHANNEL_FRONTEND = slack.defaultChannel;
+          configOptions.SLACK_CHANNEL_FRONTEND = slack.defaultChannel;
         }
 
         if (slack.channels.backend) {
-          configOptions.notification.SLACK_CHANNEL_BACKEND = slack.channels.backend;
+          configOptions.SLACK_CHANNEL_BACKEND = slack.channels.backend;
         } else {
-          configOptions.notification.SLACK_CHANNEL_BACKEND = slack.defaultChannel;
+          configOptions.SLACK_CHANNEL_BACKEND = slack.defaultChannel;
         }
 
         if (slack.channels.project) {
-          configOptions.notification.SLACK_CHANNEL_PROJECT = slack.channels.project;
+          configOptions.SLACK_CHANNEL_PROJECT = slack.channels.project;
         } else {
-          configOptions.notification.SLACK_CHANNEL_PROJECT = slack.defaultChannel;
+          configOptions.SLACK_CHANNEL_PROJECT = slack.defaultChannel;
         }
       }
     }
@@ -342,16 +331,34 @@ module.exports.getConfigOptions = () => {
 
     if (mail) {
       if (mail.channels) {
-        const defaultChannelPrefix = this.getNotificationMailChannel(mail.defaultChannel);
-
         if (mail.channels.frontend) {
-          configOptions.notification.MAIL_CHANNEL_FRONTEND = this.getNotificationMailAddress(mail.channels.frontend);
+          configOptions.MAIL_ADDRESS_FRONTEND = this.getNotificationMailAddress(mail.channels.frontend);
         }
         if (mail.channels.backend) {
-          configOptions.notification.MAIL_CHANNEL_BACKEND = this.getNotificationMailAddress(mail.channels.backend);
+          configOptions.MAIL_ADDRESS_BACKEND = this.getNotificationMailAddress(mail.channels.backend);
         }
         if (mail.channels.project) {
-          configOptions.notification.MAIL_CHANNEL_PROJECT = this.getNotificationMailAddress(mail.channels.project);
+          configOptions.MAIL_ADDRESS_PROJECT = this.getNotificationMailAddress(mail.channels.project);
+        }
+      }
+    }
+
+    const msteams = notification.msteams;
+
+    if (msteams) {
+      if (msteams.host) {
+        configOptions.MSTEAMS_HOST = msteams.host;
+      }
+
+      if (msteams.channels) {
+        if (msteams.channels.frontend) {
+          configOptions.MSTEAMS_FRONTEND_CHANNEL = msteams.channels.frontend;
+        }
+        if (msteams.channels.backend) {
+          configOptions.MSTEAMS_BACKEND_CHANNEL = msteams.channels.backend;
+        }
+        if (msteams.channels.project) {
+          configOptions.MSTEAMS_PROJECT_CHANNEL = msteams.channels.project;
         }
       }
     }
@@ -405,7 +412,20 @@ module.exports.getNotificationMailChannel = (channelName) => {
 module.exports.getNotificationMailAddress = (channelName) => {
   const config = this.getConfig();
 
-  const channelPrefix = this.getNotificationMailChannel(channelName);
+  const getChannel = (channelName) => {
+    let channelPrefix;
+
+    if (config && config.notification && config.notification.mail && config.notification.mail.channelsMap) {
+      channelPrefix = config.notification.mail.channelsMap[channelName];
+      if (!channelPrefix) {
+        channelPrefix = config.notification.mail.channelsMap[config.notification.mail.defaultChannel];
+      }
+    }
+
+    return channelPrefix;
+  }
+
+  const channelPrefix = getChannel(channelName);
 
   return channelPrefix + config.notification.mail.addressSuffix;
 }

package/scripts/csdr/init/remotes/15.x/full/options/participant/app/module.component.ts

@@ -17,7 +17,7 @@ enum ElementStatus {
             <div style="height: 100%"></div>
         </eui-block-content>
         <ng-container *ngIf="moduleStatus === ElementStatus.Loaded">
-            <@block.container.name@ [block]="block"></@block.container.name@>
+            <!-- BLOCK_CONTAINER_PLACEHOLDER -->
         </ng-container>
         <ng-container *ngIf="moduleStatus === ElementStatus.Error">
             <div class="error-container">

package/scripts/csdr/init/remotes.js

@@ -211,10 +211,21 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
           if (remote.skeletonConfig.options.participant) {
             tools.copy(optionParticipantPath, remoteSrcPath);
             pushContent(optionParticipantDef);
-          }
 
-          if (remote.skeletonConfig.options.participant) {
-            tools.replaceInPath(remoteSrcPath, '@block.container.name@', remote.skeletonConfig.blockContainerName);
+            let blockContainerPlaceholder = '';
+            if (remote.skeletonConfig.blockContainerName) {
+              blockContainerPlaceholder = `<${remote.skeletonConfig.blockContainerName} [block]="block"></${remote.skeletonConfig.blockContainerName}>`;
+            }
+            if (remote.skeletonConfig.blockContainerTypes) {
+              remote.skeletonConfig.blockContainerTypes.forEach((bc) => {
+                blockContainerPlaceholder += `
+                  <ng-container *ngIf="${bc.condition}">
+                      <${bc.name} [block]="block"></${bc.name}>
+                  </ng-container>
+                `;
+              });
+            }
+            tools.replaceInPath(remoteSrcPath, '<!-- BLOCK_CONTAINER_PLACEHOLDER -->', blockContainerPlaceholder);
           }
         }
 

package/scripts/csdr/install/local-dev.js

@@ -106,7 +106,7 @@ module.exports.install = () => {
 
     // Parse dependencies against carrets ones for projects
     .then(() => {
-      const fixedDeps = configUtils.global.getConfig().npm.fixedDependencies;
+      const fixedDeps = configUtils.global.getConfigOptions().NPM_FIXED_DEPENDENCIES;
 
       const configDeps = { ...resolvedDeps, ...fixedDeps };
 

package/scripts/csdr/install/packages.js

@@ -255,7 +255,7 @@ module.exports.installDeps = (prj, pkg, isMaster) => {
         prjDeps = tools.getJsonFileContent(prjJsonFile) || {};
       }
 
-      const fixedDeps = configUtils.global.getConfig().npm.fixedDependencies;
+      const fixedDeps = configUtils.global.getConfigOptions().NPM_FIXED_DEPENDENCIES;
 
       if (pkg.build && pkg.build.ownDepsOnly) {
         return innerCommon.installDeps({ ...localPkgBaseDeps, ...remappedDeps, ...localPkgDeps, ...fixedDeps});

package/scripts/csdr/install/projects.js

@@ -159,7 +159,7 @@ module.exports.installDeps = (prj, envTarget, compositeType) => {
       tools.logInfo('Found base dependencies:');
       console.log(prjBaseDeps);
 
-      const fixedDeps = configUtils.global.getConfig().npm.fixedDependencies;
+      const fixedDeps = configUtils.global.getConfigOptions().NPM_FIXED_DEPENDENCIES;
 
       return innerCommon.installDeps({ ...prjBaseDeps, ...compositeDeps, ...prjFixedDeps, ...fixedDeps });
     })

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

@@ -100,7 +100,7 @@ module.exports.run = () => {
       console.log(project);
 
       // start mailStack
-      utils.notification.mailstack.startMailStack();
+      utils.notification.messageStack.startStack();
 
       return utils.notification.project.sendProjectMessage({
         project: project,
@@ -389,9 +389,7 @@ module.exports.run = () => {
       })
 
       .then(() => {
-        utils.notification.mailstack.endMailStack();
-
-        return utils.notification.mailstack.sendMailStackProject(project);
+        utils.notification.messageStack.endStack();
       })
     })
 
@@ -415,9 +413,8 @@ module.exports.run = () => {
         return utils.notification.config.storeProjectConfig(project);
       })
       .then(() => {
-        utils.notification.mailstack.endMailStack();
-
-        return utils.notification.mailstack.sendMailStackProject(project);
+        utils.notification.messageStack.endStack();
+        return utils.notification.messageStack.sendProjectMessage(project);
       })
 
       .then(() => {

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

@@ -104,7 +104,7 @@ module.exports.init = (pkg, envTarget, compositeType) => {
     // Starting the release flow
     .then(() => {
       // initiating mail buffer
-      utils.notification.mailstack.startMailStack();
+      utils.notification.messageStack.startStack();
 
       // run start
       console.log('\n\n');
@@ -671,8 +671,6 @@ 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....');
@@ -724,12 +722,8 @@ module.exports.close = (pkg) => {
 
   return Promise.resolve()
     .then(() => {
-      return utils.notification.mailstack.endMailStack();
-    })
-
-    .then(() => {
-      const branches = this.getBranches();
-      return utils.notification.mailstack.sendMailStackPackage(pkg, branches);
+      utils.notification.messageStack.endStack();
+      return utils.notification.messageStack.sendPackageMessage(pkg);
     })
 
     .catch((e) => {

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

@@ -142,15 +142,17 @@ module.exports.run = () => {
       .then(() => {
         return innerCommon.sendSuccessNotification(pkg, newVersion, pkgMetadata)
           .then(() => {
-            innerCommon.close(pkg);
+            return innerCommon.close(pkg);
           });
       })
 
       .catch((e) => {
         return innerCommon.sendErrorNotification(pkg, e, pkgMetadata)
           .then(() => {
-            innerCommon.close(pkg);
+            return innerCommon.close(pkg);
+          })
+          .then(() => {
             process.exit(1);
-          });
+          })
       })
 }

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

@@ -15,7 +15,7 @@ module.exports.run = () => {
   // npm run pkg:release mywp-dashboard-eui15-remote-el-ui -- --dryRun --branch master --remoteBuild true --virtual true --envTarget DEV --skipInstall
 
   // normal UI package / old style remote
-  // npm run pkg:release csdr-core-ui -- --dryRun --branch develop --skipInstall
+  // npm run pkg:release eui-tools -- --dryRun --branch develop --skipInstall --skipCompile --skipTest --skipDoc --skipClone
 
 
   return Promise.resolve()

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

@@ -185,15 +185,17 @@ module.exports.run = () => {
       .then(() => {
         return innerCommon.sendSuccessNotification(pkg, newVersion, pkgMetadata)
           .then(() => {
-            innerCommon.close(pkg);
+            return innerCommon.close(pkg);
           });
       })
 
       .catch((e) => {
         return innerCommon.sendErrorNotification(pkg, e, pkgMetadata)
           .then(() => {
-            innerCommon.close(pkg);
+            return innerCommon.close(pkg);
+          })
+          .then(() => {
             process.exit(1);
-          });
+          })
       })
 }

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

@@ -10,10 +10,17 @@ const configUtils = require('../../config/config-utils');
 const auditUtils = require('../../audit/audit-utils');
 const tools = require('../../../utils/tools');
 
+// ARGS
+const { skipInstall } = tools.getArgs();
 
 module.exports.install = (pkg, isMaster) => {
   tools.logBanner('INSTALL');
 
+  if (skipInstall) {
+    tools.logInfo('Installation skipped...aborting');
+    return Promise.resolve;
+  }
+
   return Promise.resolve()
 
   // FETCHING CURRENT PACKAGES & INSTALL

package/scripts/index.js

@@ -32,11 +32,12 @@ module.exports.cleanUtils = require('./utils/clean/clean-utils');
 module.exports.notificationCommon = require('./utils/notification/common');
 module.exports.notificationConfig = require('./utils/notification/config');
 module.exports.notificationMailUtils = require('./utils/notification/mail-utils');
-module.exports.notificationMailStack = require('./utils/notification/mailstack');
+module.exports.notificationMessageStack = require('./utils/notification/message-stack');
 module.exports.notificationUtils = require('./utils/notification/notification-utils');
 module.exports.notificationPackage = require('./utils/notification/package');
 module.exports.notificationProject = require('./utils/notification/project');
 module.exports.notificationSlackUtils = require('./utils/notification/slack-utils');
+module.exports.notificationTeamsUtils = require('./utils/notification/teams-utils');
 
 // utils - pre-build
 module.exports.prebuildUtilsElements = require('./utils/pre-build/elements');

package/scripts/utils/api-utils.js

@@ -88,7 +88,7 @@ module.exports.get = (pathName) => {
 }
 
 
-module.exports.post = (pathName, body) => {
+module.exports.authPost = (pathName, body) => {
   const fetch = require('node-fetch');
   const { API_HOST } = configUtils.global.getConfigOptions();
 
@@ -124,3 +124,29 @@ module.exports.post = (pathName, body) => {
 }
 
 
+module.exports.post = (host, pathName, body) => {
+  const fetch = require('node-fetch');
+
+  tools.logInfo(`API post - host: ${host}`);
+
+  return Promise.resolve()
+    .then(() => {
+      return fetch(`${host}${pathName}`, {
+        method: 'POST',
+        headers: {
+          'content-type': 'application/json'
+        },
+        body: JSON.stringify(body)
+      })
+    })
+    .then((res) => {
+      handleResponse(res);
+      return res.json();
+    })
+    .catch(e => {
+      tools.logDebugTrace(__filename, 'post', e);
+      throw e;
+    });
+}
+
+

package/scripts/utils/build/package/nodeJs.js

@@ -41,6 +41,8 @@ module.exports.build = (pkg, isMaster) => {
     })
 
     .then(() => {
+      // throw new Error('FAKE FAILURE');
+
       return notificationUtils.package.sendPackageMessage({
         package: pkg
       })

package/scripts/utils/index.js

@@ -15,6 +15,8 @@ const preBuildUtils = require('./pre-build/pre-build-utils');
 const publishUtils = require('./publish/publish-utils');
 const sonarUtils = require('./sonar/sonar-utils');
 const apiUtils = require('./api-utils');
+const testUtils = require('./test/test-utils');
+const remoteUtils = require('./remotes/remotes-utils');
 
 module.exports = {
   changelog: changelogUtils,
@@ -31,4 +33,6 @@ module.exports = {
   publish: publishUtils,
   sonar: sonarUtils,
   api: apiUtils,
+  test: testUtils,
+  remote: remoteUtils
 }

package/scripts/utils/notification/common.js

@@ -6,13 +6,13 @@ const metadataUtils = require('../../csdr/metadata/metadata-utils');
 module.exports.getMessage = (options) => {
   const message = {
     scope: null,
-    version: options.version,
-    exception: options.exception,
+    version: options.version || null,
+    exception: options.exception || null,
     mainTitle: null,
     mainText: null,
     detailTitle: null,
     detailText: null,
-    text: options.text,
+    text: options.text || null,
     status: null,
     statusColor: null
   };

package/scripts/utils/notification/config.js

@@ -12,28 +12,35 @@ module.exports.getPackageConfig = (pkg) => {
   // Fetching global config - default if not overriden in package own config
   const globalConfig = configUtils.global.getConfigOptions();
 
-  var slackChannel, mailChannel;
+  var slackChannel, mailAdress, msTeamsChannel, msTeamsHook;
 
   if (pkg.backend) {
-    slackChannel = globalConfig.notification.SLACK_CHANNEL_BACKEND;
-    mailChannel = globalConfig.notification.MAIL_CHANNEL_BACKEND;
+    slackChannel = globalConfig.SLACK_CHANNEL_BACKEND;
+    mailAdress = globalConfig.MAIL_ADDRESS_BACKEND;
+    msTeamsChannel = globalConfig.MSTEAMS_BACKEND_CHANNEL;
   } else {
-    slackChannel = globalConfig.notification.SLACK_CHANNEL_FRONTEND;
-    mailChannel = globalConfig.notification.MAIL_CHANNEL_FRONTEND;
+    slackChannel = globalConfig.SLACK_CHANNEL_FRONTEND;
+    mailAdress = globalConfig.MAIL_ADDRESS_FRONTEND;
+    msTeamsChannel = globalConfig.MSTEAMS_FRONTEND_CHANNEL;
   }
 
   // checking package notification strategy override
   if (!pkg.notification && !pkg.slack) {
-    if (globalConfig.notification.CLIENT === 'SLACK') {
+    if (globalConfig.NOTIFICATION_CLIENT === 'SLACK') {
       return {
-        CLIENT: globalConfig.notification.CLIENT,
+        CLIENT: globalConfig.NOTIFICATION_CLIENT,
         SLACK_HOOK: globalConfig.SLACK_HOOK,
         SLACK_CHANNEL: slackChannel
       }
-    } else {
+    } else if (globalConfig.NOTIFICATION_CLIENT === 'MAIL') {
       return {
-        CLIENT: globalConfig.notification.CLIENT,
-        MAIL_ADDRESS:  configUtils.global.getNotificationMailAddress(mailChannel)
+        CLIENT: globalConfig.NOTIFICATION_CLIENT,
+        MAIL_ADDRESS: mailAdress
+      }
+    } else if (globalConfig.NOTIFICATION_CLIENT === 'SLACK') {
+      return {
+        CLIENT: globalConfig.NOTIFICATION_CLIENT,
+        MSTEAMS_CHANNEL: msTeamsChannel,
       }
     }
 
@@ -47,18 +54,23 @@ module.exports.getPackageConfig = (pkg) => {
 
   // new method, notification config can be either slack or mail
   } else {
-    if (pkg.notification.channel) {
+    if (pkg.notification) {
       if (pkg.notification.client === 'SLACK') {
         return {
           CLIENT: pkg.notification.client,
           SLACK_HOOK: globalConfig.SLACK_HOOK,
           SLACK_CHANNEL: pkg.notification.channel
         }
-      } else {
+      } else if (pkg.notification.client === 'MAIL') {
         return {
           CLIENT: pkg.notification.client,
           MAIL_ADDRESS: configUtils.global.getNotificationMailAddress(pkg.notification.channel)
         }
+      } else if (pkg.notification.client === 'MSTEAMS') {
+        return {
+          CLIENT: pkg.notification.client,
+          MSTEAMS_CHANNEL: pkg.notification.channel,
+        }
       }
     }
   }
@@ -70,16 +82,21 @@ module.exports.getProjectConfig = (project) => {
 
   // checking project notification strategy override
   if (!project.notification && !project.slack) {
-    if (globalConfig.notification.CLIENT === 'SLACK') {
+    if (globalConfig.NOTIFICATION_CLIENT === 'SLACK') {
       return {
-        CLIENT: globalConfig.notification.CLIENT,
+        CLIENT: globalConfig.NOTIFICATION_CLIENT,
         SLACK_HOOK: globalConfig.SLACK_HOOK,
-        SLACK_CHANNEL: globalConfig.notification.SLACK_CHANNEL_PROJECT
+        SLACK_CHANNEL: globalConfig.SLACK_CHANNEL_PROJECT
       }
-    } else {
+    } else if (globalConfig.NOTIFICATION_CLIENT === 'MAIL') {
       return {
-        CLIENT: globalConfig.notification.CLIENT,
-        MAIL_ADDRESS:  configUtils.global.getNotificationMailAddress(globalConfig.notification.MAIL_CHANNEL_PROJECT)
+        CLIENT: globalConfig.NOTIFICATION_CLIENT,
+        MAIL_ADDRESS: globalConfig.MAIL_ADDRESS_PROJECT
+      }
+    } else if (globalConfig.NOTIFICATION_CLIENT === 'MSTEAMS') {
+      return {
+        CLIENT: globalConfig.NOTIFICATION_CLIENT,
+        MSTEAMS_CHANNEL: globalConfig.MSTEAMS_PROJECT_CHANNEL,
       }
     }
 
@@ -93,31 +110,37 @@ module.exports.getProjectConfig = (project) => {
 
   // new method, notification config can be either slack or mail
   } else {
-    if (project.notification.channel) {
+    if (project.notification) {
       if (project.notification.client === 'SLACK') {
         return {
           CLIENT: project.notification.client,
           SLACK_HOOK: globalConfig.SLACK_HOOK,
           SLACK_CHANNEL: project.notification.channel
         }
-      } else {
+      } else if (project.notification.client === 'MAIL') {
         return {
           CLIENT: project.notification.client,
           MAIL_ADDRESS: configUtils.global.getNotificationMailAddress(project.notification.channel)
         }
+      } else if (project.notification.client === 'MSTEAMS') {
+        return {
+          CLIENT: globalConfig.NOTIFICATION_CLIENT,
+          MSTEAMS_CHANNEL: project.notification.channel,
+        }
       }
     }
   }
 }
 
 
-module.exports.storeConfig = (rootPath, slackHook, slackChannel, mailAddress) => {
+module.exports.storeConfig = (rootPath, slackHook, slackChannel, mailAddress, msTeamsChannel) => {
   return Promise.resolve()
     .then(() => {
       var content = '';
       content += `export SLACK_HOOK=${slackHook}\n`;
       content += `export SLACK_CHANNEL=${slackChannel}\n`;
       content += `export MAIL_ADDRESS=${mailAddress}\n`;
+      content += `export MSTEAMS_CHANNEL=${msTeamsChannel}\n`;
       return pipelineUtils.setVariables(rootPath, content);
     })
 
@@ -130,7 +153,9 @@ module.exports.storePackageConfig = (pkg) => {
   return Promise.resolve()
     .then(() => {
       const config = this.getPackageConfig(pkg);
-      return this.storeConfig(process.cwd(), config.SLACK_HOOK, config.SLACK_CHANNEL, config.MAIL_ADDRESS);
+      return this.storeConfig(
+        process.cwd(), config.SLACK_HOOK, config.SLACK_CHANNEL, config.MAIL_ADDRESS, config.MSTEAMS_CHANNEL
+      );
     })
 
     .catch((e) => {
@@ -142,7 +167,9 @@ module.exports.storeProjectConfig = (project) => {
   return Promise.resolve()
     .then(() => {
       const config = this.getProjectConfig(project);
-      return this.storeConfig(project.paths.rootPath, config.SLACK_HOOK, config.SLACK_CHANNEL, config.MAIL_ADDRESS);
+      return this.storeConfig(
+        project.paths.rootPath, config.SLACK_HOOK, config.SLACK_CHANNEL, config.MAIL_ADDRESS, config.MSTEAMS_CHANNEL
+      );
     })
 
     .catch((e) => {

package/scripts/utils/notification/mail-utils.js

@@ -1,14 +1,15 @@
 'use strict';
 
-// GLOBALS
-const sendmail = require('sendmail')();
 
 // LOCALS
 const tools = require('../tools');
+
 let { dryRun, debug} = tools.getArgs();
 
 
 const sendCore = (subject, body, recipient) => {
+  const sendmail = require('sendmail')();
+
   tools.logInfo(`Sending mail to : ${recipient}`);
   tools.logInfo('Message subject / body :');
   console.log(subject);

package/scripts/utils/notification/message-stack.js

@@ -0,0 +1,113 @@
+'use strict';
+
+// GLOBAL
+const moment = require('moment');
+
+// LOCAL
+const tools = require('../tools');
+
+// INNER MODS
+const innerConfig = require('./config');
+const innerTeamsUtils = require('./teams-utils');
+
+// ARGS
+const { dryRun, debug, notificationActive } = tools.getArgs();
+
+
+// ---------------------------------------------------------------------------------------
+// MESSAGE BUFFER
+// - used for storing all message happening during a run
+// - used for aggregating messages on a pipeline run to a single mail / ms teams push
+// ---------------------------------------------------------------------------------------
+
+const messageContent = {
+  buffer: [],
+  startTimestamp: null,
+  endTimestamp: null,
+  duration: null,
+  durationMinSec: null
+};
+
+module.exports.startStack = () => {
+  messageContent.startTimestamp = moment();
+}
+
+module.exports.endStack = () => {
+  messageContent.endTimestamp = moment();
+  messageContent.duration = messageContent.endTimestamp - messageContent.startTimestamp;
+  const start = messageContent.startTimestamp, end = messageContent.endTimestamp;
+  messageContent.durationMinSec = `${end.diff(start, 'm')}m:${end.diff(start, 's')}s`;
+}
+
+module.exports.pushMessage = (message) => {
+  messageContent.buffer.push(message);
+}
+
+
+
+const sendMessage = (config) => {
+
+  if (config.CLIENT === 'SLACK') {
+    return Promise.resolve();
+  }
+
+  if (!notificationActive) {
+    tools.logInfo('No notifications config found...skipping');
+
+    if (debug) {
+      console.log(messageContent);
+    }
+
+    return Promise.resolve();
+
+  } else {
+    return Promise.resolve()
+      .then(() => {
+        if (config.CLIENT === 'MSTEAMS') {
+          return innerTeamsUtils.sendMessage(config, messageContent);
+
+        } else if (config.CLIENT === 'MAIL') {
+          // TODO IF MAIL NOTIF IS NEEDED...
+        }
+      })
+      .catch((e) => {
+        throw e;
+      })
+  }
+}
+
+
+module.exports.sendPackageMessage = (pkg) => {
+  tools.logTitle(`Sending package message for ${pkg.name}`);
+
+  const config = innerConfig.getPackageConfig(pkg);
+
+  tools.logInfo('Notification config : ');
+  console.log(config);
+
+  return Promise.resolve()
+    .then(() => {
+      return sendMessage(config);
+    })
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
+module.exports.sendProjectMessage = (project) => {
+  tools.logTitle(`Sending project message for ${project.name}`);
+
+  const config = innerConfig.getProjectConfig(project);
+
+  tools.logInfo('Notification config : ');
+  console.log(config);
+
+  return Promise.resolve()
+    .then(() => {
+      return sendMessage(config);
+    })
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/utils/notification/notification-utils.js

@@ -4,10 +4,10 @@ const innerCommon = require('./common');
 const innerConfig = require('./config');
 const innerPackage = require('./package');
 const innerProject = require('./project');
-const innerMailstack = require('./mailstack');
+const innerMessageStack = require('./message-stack');
 
 module.exports.common = innerCommon;
 module.exports.config = innerConfig;
 module.exports.package = innerPackage;
 module.exports.project = innerProject;
-module.exports.mailstack = innerMailstack;
+module.exports.messageStack = innerMessageStack;

package/scripts/utils/notification/package.js

@@ -9,16 +9,24 @@ const tools = require('../tools');
 // INNER
 const innerCommon = require('./common');
 const innerConfig = require('./config');
-const innerMailstack = require('./mailstack');
+const innerMessageStack = require('./message-stack');
 
+// ARGS
+const { debug } = tools.getArgs();
 
 
 module.exports.sendPackageMessage = (options) => {
+  tools.logTitle('Sending package message');
 
   const message = innerCommon.getMessage(options);
 
+  if (debug) {
+    tools.logInfo('Message content :');
+    console.log(message);
+  }
+
   // buffer message
-  innerMailstack.bufferMessage(message);
+  innerMessageStack.pushMessage(message);
 
   // getting package notification config
   const config = innerConfig.getPackageConfig(options.package);
@@ -41,18 +49,25 @@ module.exports.sendPackageMessage = (options) => {
 
 
 module.exports.sendPackageDiffReportMessage = (pkg, diffMetadata) => {
-  return Promise.resolve()
-    .then(() => {
-      const config = innerConfig.getPackageConfig(pkg);
+  tools.logTitle('Sending package difference report message');
 
-      return slackUtils.sendPackageDiffReportMessage(
-        diffMetadata,
-        config.SLACK_HOOK,
-        config.SLACK_CHANNEL
-      );
-    })
+  if (config.CLIENT === 'SLACK') {
+    return Promise.resolve()
+      .then(() => {
+        const config = innerConfig.getPackageConfig(pkg);
 
-    .catch((e) => {
-      throw e;
-    })
+        return slackUtils.sendPackageDiffReportMessage(
+          diffMetadata,
+          config.SLACK_HOOK,
+          config.SLACK_CHANNEL
+        );
+      })
+
+      .catch((e) => {
+        throw e;
+      })
+
+  } else {
+    return Promise.resolve();
+  }
 }

package/scripts/utils/notification/project.js

@@ -9,17 +9,25 @@ const tools = require('../tools');
 // INNER
 const innerCommon = require('./common');
 const innerConfig = require('./config');
-const innerMailstack = require('./mailstack');
+const innerMessageStack = require('./message-stack');
+
+// ARGS
+const { debug } = tools.getArgs();
 
 
 module.exports.sendProjectMessage = (options) => {
 
-  tools.logInfo('Sending project message');
+  tools.logTitle('Sending project message');
 
   const message = innerCommon.getMessage(options);
 
+  if (debug) {
+    tools.logInfo('Message content :');
+    console.log(message);
+  }
+
   // buffer message
-  innerMailstack.bufferMessage(message);
+  innerMessageStack.pushMessage(message);
 
   // getting package notification config
   const config = innerConfig.getProjectConfig(options.project);
@@ -42,6 +50,8 @@ module.exports.sendProjectMessage = (options) => {
 
 
 module.exports.sendProjectDiffReportMessage = (project, diffMetadata) => {
+  tools.logTitle('Sending project difference report message');
+
   return Promise.resolve()
     .then(() => {
       const config = innerConfig.getProjectConfig(project);

package/scripts/utils/notification/slack-utils.js

@@ -8,9 +8,6 @@ const HttpsProxyAgent = require('https-proxy-agent');
 // LOCAL
 const tools = require('../tools');
 
-// INNER
-const innerCommon = require('./common.js');
-
 // FETCH COMMAND-LINE ARGS
 let { dryRun, slackFeedback, debug } = tools.getArgs();
 
@@ -130,7 +127,7 @@ const getFields = (scope, version) => {
 
 
 const sendProjectMessage = (hook, channel, message) => {
-  tools.logTitle('Sending project message');
+  tools.logInfo('Sending project message');
 
   // do nothing if at least hook / channel for package can't be found
   if (!hook || !channel) {
@@ -162,7 +159,7 @@ const sendProjectMessage = (hook, channel, message) => {
 
 
 const sendProjectDiffReportMessage = (diffMetadata, slackHook, slackChannel) => {
-  tools.logTitle('Sending diff report message');
+  tools.logInfo('Sending diff report message');
 
   // do nothing if at least hook / channel for project can't be found
   if (!slackHook || !slackChannel) {
@@ -191,29 +188,11 @@ const sendProjectDiffReportMessage = (diffMetadata, slackHook, slackChannel) =>
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
 const sendPackageMessage = (hook, channel, message) => {
-  tools.logTitle('Sending package message');
+  tools.logInfo('Sending package message');
 
   // do nothing if at least hook / channel for package can't be found
   if (!hook || !channel) {
@@ -244,11 +223,8 @@ const sendPackageMessage = (hook, channel, message) => {
 }
 
 
-
-
-
 const sendPackageDiffReportMessage = (diffMetadata, slackHook, slackChannel) => {
-  tools.logTitle('Sending diff report message');
+  tools.logInfo('Sending diff report message');
 
   // do nothing if at least hook / channel for project can't be found
   if (!slackHook || !slackChannel) {
@@ -276,17 +252,6 @@ const sendPackageDiffReportMessage = (diffMetadata, slackHook, slackChannel) =>
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
 // EXPORTS
 
 module.exports = {

package/scripts/utils/notification/teams-utils.js

@@ -0,0 +1,114 @@
+'use strict';
+
+// LOCALS
+const tools = require('../tools');
+const apiUtils = require('../api-utils');
+const configUtils = require('../../csdr/config/config-utils');
+
+// ARGS
+const { dryRun, debug} = tools.getArgs();
+
+
+const getChannelHook = (channelName) => {
+  // const { msteamsHookMap } = tools.getArgs();
+  // TODO channel/hook map parser (incoming from _CSDR_ARGS gitlab defs)
+  return msteamsHook;
+}
+
+
+const createPayload = (messageContent) => {
+  const emojis = {
+    rocket: "🚀",
+    sucess: "✅",
+    failure: "❌"
+  };
+
+  const statuses = {
+    success: { text: '[BUILD SUCCESS]', color: '26A65B', emoji: emojis.sucess},
+    failure: { text: '[BUILD FAILED]', color: 'D91E18', emoji: emojis.failure}
+  };
+
+
+  // set color : success or failure
+  let status = statuses.success;
+  if (messageContent.buffer.filter(m => m.status === 'SUCCESS').length === 0) {
+    status = statuses.failure;
+  }
+
+  // final status message on the stack
+  const finalMessage = messageContent.buffer.slice(-1)[0];
+
+  // set released version
+  const version = finalMessage.version;
+
+  // set commit history
+  const commitHistory = "```" + finalMessage.detailText;
+
+  // set summary
+  const itemName = messageContent.buffer[0].scope;
+  const summary = `${status.emoji} :: ${status.text} - ${itemName} - ${version}`;
+
+  // set release sections
+  const publications = messageContent.buffer.filter(m => m.text !== null && m.text.indexOf(':rocket:') > -1);
+
+  let sections = publications.map((p) => {
+    return {
+      "activityTitle": version,
+      "facts": [],
+      "activityText": p.text.replace(':rocket:', emojis.rocket).replace('- *VERSION*', '')
+    }
+  });
+
+  sections.push({
+    "startGroup": true,
+    "activityTitle": "Commit history since last release tag",
+    "activityText": commitHistory
+  });
+
+  sections.push({
+    "startGroup": true,
+    "facts": [
+      {
+        "name": "Duration",
+        "value": `**${messageContent.durationMinSec}**`
+      },
+    ]
+  });
+
+  // return payload
+  return {
+    "@type": "MessageCard",
+    "@context": "https://schema.org/extensions",
+    "summary": summary,
+    "themeColor": status.color,
+    "title": summary,
+    "sections": sections
+  };
+}
+
+
+module.exports.sendMessage = (config, messageContent) => {
+  tools.logTitle('Sending MS teams message');
+
+  const channelHook = getChannelHook(config.MSTEAMS_CHANNEL);
+  const payload = createPayload(messageContent);
+
+  return Promise.resolve()
+    .then(() => {
+      if (debug) {
+        console.log(messageContent);
+        console.log(JSON.parse(JSON.stringify(payload, null, 2)));
+      }
+    })
+    .then(() => {
+      const host = configUtils.global.getConfigOptions().MSTEAMS_HOST;
+
+      return apiUtils.post(host, channelHook, JSON.parse(JSON.stringify(payload, null, 2)));
+    })
+    .then((response) => {
+      console.log(response);
+    })
+    .catch(e => {
+      throw e;
+    })
+}