@eui/tools 5.0.0-rc.21 → 5.0.0-rc.22

package/.version.properties

@@ -1 +1 @@
-5.0.0-rc.21
+5.0.0-rc.22

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.0.0-rc.22 (2022-04-04)
+
+##### Chores
+
+* **other:**
+  * adapted version fetching for prev or next deps - finalized test for CSDR API - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([9069d987](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/9069d98718d503532ca31e79cd75f47a960d448a))
+
+* * *
+* * *
 ## 5.0.0-rc.21 (2022-04-01)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.0.0-rc.21",
+    "version": "5.0.0-rc.22",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -754,12 +754,177 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //     console.log(e);
 //   })
 
+
+// A LA CARTE REMOTE TESTING
+
 const pkg = configUtils.packages.getPackage('mywp-dummy-eui10-remote-el-ui');
 
+// Promise.resolve()
+//   .then(() => {
+//     return versionUtils.packageRemote.getNewVersion(pkg, 'DEV');
+//   })
+//   .then((version) => {
+//     console.log(version);
+//   })
+
+// Promise.resolve()
+//   .then(() => {
+//     return metadataUtils.packageEnvs.getMetadata(pkg);
+//   })
+//   .then((envsMetadata) => {
+//     return installUtils.compositeCore.getCompositeDeps(
+//       pkg.paths.pkgFromRoot,
+//       'DEV',
+//       'DEFAULT',
+//       false,
+//       envsMetadata
+//     )
+//   })
+//   .then((deps) => {
+//     console.log(deps);
+//   })
+
+
+// MIGRATE metadata to API - lowdb
+
 Promise.resolve()
   .then(() => {
-    return versionUtils.packageRemote.getNewVersion(pkg, 'DEV');
-  })
-  .then((version) => {
-    console.log(version);
+    var db = {};
+
+    // process devops-metadata global
+    var globalsJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', '.devops-metadata.json'));
+
+    db["globals"] = {
+      packages: globalsJson.packages.map((p) => {
+        return {
+          name: p.name,
+          version: p.version,
+          npmPkg: p.npmPkg
+        }
+      }),
+      latest: globalsJson.packagesLatestTag.map((p) => {
+        return {
+          name: p.name,
+          version: p.version,
+          npmPkg: p.npmPkg
+        }
+      }),
+      next: globalsJson.packagesNextTag.map((p) => {
+        return {
+          name: p.name,
+          version: p.version,
+          npmPkg: p.npmPkg
+        }
+      }),
+      prev: globalsJson.packagesPrevTag.map((p) => {
+        return {
+          name: p.name,
+          version: p.version,
+          npmPkg: p.npmPkg
+        }
+      }),
+      prevSnapshots: globalsJson.packagesPrevSnapshotsTag.map((p) => {
+        return {
+          name: p.name,
+          version: p.version,
+          npmPkg: p.npmPkg
+        }
+      }),
+    };
+
+    // process apps and packages files
+    var from = path.join(process.cwd(), 'packages', 'devops-metadata');
+    var globPattern = '**/*.json';
+    var files = glob.sync(globPattern, { cwd: from, nodir: true, follow: true, dot: true });
+
+    // extract apps content
+    var apps = files
+      .filter(f => f.startsWith('app-'))
+      .map((f) => {
+        return f.replace('-build-metadata.json', '')
+                .replace('-envs-metadata.json', '')
+                .replace('-history-metadata.json', '')
+                .replace('-versions-metadata.json', '');
+      });
+    apps = tools.removeArrayDuplicates(apps);
+    console.log(apps);
+
+    db["apps"] = [];
+
+    apps.forEach((app) => {
+      const buildFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${app}-build-metadata.json`));
+      const envsFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${app}-envs-metadata.json`));
+      const historyFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${app}-history-metadata.json`));
+      const versionsFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${app}-versions-metadata.json`));
+
+      db["apps"].push({
+        name: app,
+        buildVersions: buildFileJson.versions,
+        envs: envsFileJson,
+        history: historyFileJson.versions,
+        versions: versionsFileJson.versions
+      });
+    })
+
+
+    // extract pkg content
+    var pkgs = files
+      .filter(f => !f.startsWith('app-'))
+      .map((f) => {
+        return f.replace('-build-metadata.json', '')
+                .replace('-envs-metadata.json', '')
+                .replace('-history-metadata.json', '')
+                .replace('-versions-metadata.json', '');
+      });
+    pkgs = tools.removeArrayDuplicates(pkgs);
+    console.log(pkgs);
+
+    db["packages"] = [];
+
+    pkgs.forEach((pkg) => {
+      const buildFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${pkg}-build-metadata.json`));
+      const envsFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${pkg}-envs-metadata.json`));
+      const historyFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${pkg}-history-metadata.json`));
+      const versionsFileJson = tools.getJsonFileContent(path.join(process.cwd(), 'packages', 'devops-metadata', `${pkg}-versions-metadata.json`));
+
+      db["packages"].push({
+        name: pkg,
+        buildVersions: buildFileJson.versions,
+        envs: envsFileJson,
+        history: historyFileJson.versions,
+        versions: versionsFileJson.versions
+      });
+    })
+
+    tools.writeJsonFileSync(path.join(process.cwd(), 'db.json'), db);
   })
+
+
+
+
+
+
+
+
+// METADATA API TESTING
+// --------------------
+// const metadataModule = require('./scripts/csdr/metadata/v2');
+
+// Promise.resolve()
+//   .then(() => {
+//     return metadataModule.package.getMetadata(pkg);
+//   })
+//   .then((metadata) => {
+//     console.log(metadata);
+//   })
+//   .then(() => {
+//     return metadataModule.global.getMetadata();
+//   })
+//   .then((metadata) => {
+//     console.log(metadata);
+//   })
+//   .catch((e) => {
+//     console.log(e);
+//   })
+
+

package/scripts/csdr/install/common.js

@@ -73,6 +73,7 @@ const executeInstall = (cwdPath) => {
 
 
 const getRemappedDeps = (pkgDeps, pkgDefaultDeps, isMaster) => {
+  tools.logTitle('Remapping major version carret declared dependencies');
 
   return Promise.resolve()
     .then(() => {
@@ -81,6 +82,7 @@ const getRemappedDeps = (pkgDeps, pkgDefaultDeps, isMaster) => {
 
           // if the package is being part of CSDR
           if (pkgDeps[k]) {
+
             const latestTagMajor = pkgDeps[k].split('.')[0];
 
             var currentMajor;
@@ -110,6 +112,8 @@ const getRemappedDeps = (pkgDeps, pkgDefaultDeps, isMaster) => {
           return acc;
         }, {});
 
+      tools.logSuccess();
+
       return dependencies;
     })
 
@@ -128,7 +132,7 @@ const getRemappedDeps = (pkgDeps, pkgDefaultDeps, isMaster) => {
 
 
 const getResolvedCarretDeps = (deps, isMaster) => {
-  tools.logTitle('Resolving carret for next version packages');
+  tools.logTitle('Resolving carret versions for prev or next version packages');
 
   tools.logInfo('processing dependencies : ');
   console.log(deps);

package/scripts/csdr/metadata/package.js

@@ -426,12 +426,22 @@ module.exports.getPackageVersionsByMajor = (pkg, major, isMaster) => {
   const pkgVersions = this.getPackageVersions(pkg);
 
   if (pkgVersions) {
-    return pkgVersions.filter((v) => {
-      return (v.version.split('.')[0] === major && v.version.indexOf('snapshot') === -1) ||
-             (v.version.split('.')[0] === major && pkg.build && pkg.build.isNextMajorSnapshotAllowed) ||
-             (v.version.split('.')[0] === major && pkg.build && pkg.build.supportSnapshotBranch) ||
-             (v.version.split('.')[0] === major && v.version.indexOf('snapshot') === -1 && isMaster);
-    })
+    tools.logInfo(`----> ${pkgVersions.length} metadata versions found for package`);
+    let versions = [];
+    versions = pkgVersions.filter(v => v.version.split('.')[0] === major);
+
+    tools.logInfo(`----> ${versions.length} metadata versions found for major version : ${major}`);
+
+    if (isMaster) {
+      versions = versions.filter(v => v.version.indexOf('snapshot') === -1);
+      tools.logInfo(`----> ${versions.length} metadata versions found excluding snapshots`);
+
+    } else {
+      versions = versions.filter(v => v.version.indexOf('snapshot') !== -1);
+      tools.logInfo(`----> ${versions.length} metadata versions found including snapshots`);
+    }
+
+    return versions;
   }
 }
 

package/scripts/csdr/metadata/v2/app/_app.js

@@ -0,0 +1,21 @@
+'use strict';
+
+// LOCALS
+const utils = require('../../../../utils');
+
+
+// PUBLIC METHODS
+module.exports.getMetadata = (app) => {
+  return Promise.resolve()
+    .then(() => {
+      const urlPath = `/app/${app.name}`;
+      return utils.api.get(urlPath);
+    })
+    .then((data) => {
+      return data;
+    })
+    .catch((e) => {
+      utils.tools.logDebugTrace(__filename, 'getMetadata', e);
+      throw e;
+    })
+}

package/scripts/csdr/metadata/v2/app/app.js

@@ -0,0 +1,25 @@
+'use strict';
+
+// LOCALS
+const utils = require('../../../../utils');
+
+// PRIVATES
+const _app = require('./_app');
+
+
+// PUBLIC METHODS
+module.exports.getMetadata = (app) => {
+  utils.tools.logTitle('Get app metadata');
+
+  return Promise.resolve()
+    .then(() => {
+      return _app.getMetadata(app);
+    })
+    .then((metadata) => {
+      return metadata;
+    })
+    .catch((e) => {
+      utils.tools.logErrorTrace(__filename, 'getMetadata', e);
+      throw e;
+    })
+}

package/scripts/csdr/metadata/v2/app/index.js

@@ -0,0 +1,3 @@
+'use strict';
+
+const app = require('./app');

package/scripts/csdr/metadata/v2/global/_global.js

@@ -0,0 +1,21 @@
+'use strict';
+
+// LOCALS
+const utils = require('../../../../utils');
+
+
+// PUBLIC METHODS
+module.exports.getMetadata = () => {
+  return Promise.resolve()
+    .then(() => {
+      const urlPath = `/metadata`;
+      return utils.api.get(urlPath);
+    })
+    .then((data) => {
+      return data;
+    })
+    .catch((e) => {
+      utils.tools.logDebugTrace(__filename, 'getMetadata', e);
+      throw e;
+    })
+}

package/scripts/csdr/metadata/v2/global/global.js

@@ -0,0 +1,25 @@
+'use strict';
+
+// LOCALS
+const utils = require('../../../../utils');
+
+// PRIVATES
+const _global = require('./_global');
+
+
+// PUBLIC METHODS
+module.exports.getMetadata = () => {
+  utils.tools.logTitle('Get global metadata');
+
+  return Promise.resolve()
+    .then(() => {
+      return _global.getMetadata();
+    })
+    .then((metadata) => {
+      return metadata;
+    })
+    .catch((e) => {
+      utils.tools.logErrorTrace(__filename, 'getMetadata', e);
+      throw e;
+    })
+}

package/scripts/csdr/metadata/v2/global/index.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./global');

package/scripts/csdr/metadata/v2/index.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports.global = require('./global');
+module.exports.package = require('./package');
+module.exports.app = require('./app');

package/scripts/csdr/metadata/v2/package/_package.js

@@ -0,0 +1,21 @@
+'use strict';
+
+// LOCALS
+const utils = require('../../../../utils');
+
+
+// PUBLIC METHODS
+module.exports.getMetadata = (pkg) => {
+  return Promise.resolve()
+    .then(() => {
+      const urlPath = `/metadata/packages/${pkg.name}`;
+      return utils.api.get(urlPath);
+    })
+    .then((data) => {
+      return data;
+    })
+    .catch((e) => {
+      utils.tools.logDebugTrace(__filename, 'getMetadata', e);
+      throw e;
+    })
+}

package/scripts/csdr/metadata/v2/package/index.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./package');

package/scripts/csdr/metadata/v2/package/package.js

@@ -0,0 +1,25 @@
+'use strict';
+
+// LOCALS
+const utils = require('../../../../utils');
+
+// PRIVATES
+const _package = require('./_package');
+
+
+// PUBLIC METHODS
+module.exports.getMetadata = (pkg) => {
+  utils.tools.logTitle('Get package metadata');
+
+  return Promise.resolve()
+    .then(() => {
+      return _package.getMetadata(pkg);
+    })
+    .then((metadata) => {
+      return metadata;
+    })
+    .catch((e) => {
+      utils.tools.logErrorTrace(__filename, 'getMetadata', e);
+      throw e;
+    })
+}

package/scripts/utils/api-utils.js

@@ -1,9 +1,6 @@
 'use strict';
 
-// GLOBALS
-const fetch = require('node-fetch');
-
-// LOCAL
+// LOCALS
 const tools = require('./tools');
 const configUtils = require('../csdr/config/config-utils');
 
@@ -13,10 +10,25 @@ const { API_HOST } = configUtils.global.getConfigOptions();
 // FETCH ARGS
 const { apiUserId, apiPassword } = tools.getArgs();
 
-// GLOBALS
+// PRIVATES
 let authToken;
 
+
+const handleResponse = (response) => {
+  tools.logDebug(JSON.stringify(response));
+
+  if (response.ok) {
+    return response.data;
+  } else {
+    throw new Error(response.message);
+  }
+}
+
 module.exports.login = () => {
+  const fetch = require('node-fetch');
+
+  tools.logInfo(`API Login - userId:${apiUserId}`);
+
   return Promise.resolve()
     .then(() => {
       return fetch(`${API_HOST}/auth`, {
@@ -29,22 +41,33 @@ module.exports.login = () => {
       })
     })
     .then((res) => {
+      tools.logDebugResponse(res);
       return res.json();
     })
     .then((response) => {
       authToken = response.token;
-      return response;
+      return handleResponse(response);
     })
     .catch(e => {
+      tools.logDebugTrace(__filename, 'login', e);
       throw e;
     });
 }
 
 
-module.exports.get = (scope) => {
+module.exports.get = (pathName) => {
+  const fetch = require('node-fetch');
+
+  tools.logInfo(`API get - pathName: ${pathName}`);
+
   return Promise.resolve()
     .then(() => {
-      return fetch(`${API_HOST}/${scope}`, {
+      if (!authToken) {
+        return this.login();
+      }
+    })
+    .then(() => {
+      return fetch(`${API_HOST}${pathName}`, {
         method: 'get',
         headers: {
           'content-type': 'application/json',
@@ -53,20 +76,32 @@ module.exports.get = (scope) => {
       })
     })
     .then((res) => {
+      tools.logDebugResponse(res);
       return res.json();
     })
     .then((response) => {
-      return response;
+      return handleResponse(response);
     })
     .catch(e => {
+      tools.logDebugTrace(__filename, 'get', e);
       throw e;
     });
 }
 
-module.exports.post = (scope, body) => {
+
+module.exports.post = (pathName, body) => {
+  const fetch = require('node-fetch');
+
+  tools.logInfo(`API post - pathName: ${pathName} - body: ${JSON.stringify(body)}`);
+
   return Promise.resolve()
     .then(() => {
-      return fetch(`${API_HOST}/${scope}`, {
+      if (!authToken) {
+        return this.login();
+      }
+    })
+    .then(() => {
+      return fetch(`${API_HOST}${pathName}`, {
         method: 'post',
         headers: {
           'content-type': 'application/json',
@@ -76,15 +111,16 @@ module.exports.post = (scope, body) => {
       })
     })
     .then((res) => {
+      tools.logDebugResponse(res);
       return res.json();
     })
     .then((response) => {
-      return response;
+      return handleResponse(response);
     })
     .catch(e => {
+      tools.logDebugTrace(__filename, 'post', e);
       throw e;
     });
 }
 
 
-

package/scripts/utils/index.js

@@ -14,7 +14,7 @@ const notificationUtils = require('./notification/notification-utils');
 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');
 
 module.exports = {
   changelog: changelogUtils,
@@ -29,5 +29,6 @@ module.exports = {
   notification: notificationUtils,
   preBuild: preBuildUtils,
   publish: publishUtils,
-  sonar: sonarUtils
+  sonar: sonarUtils,
+  api: apiUtils,
 }

package/scripts/utils/tools.js

@@ -625,6 +625,11 @@ const logSuccess = (msg) => {
 const logError = (msg) => {
   log(msg, 3);
 }
+const logErrorTrace = (filename, method, e) => {
+  log(`ERROR in ${filename}`, 3);
+  log(`...method : ${method}`, 3);
+  log(`...message : ${e.message}`, 3);
+}
 
 const logWarning = (msg) => {
   log(msg, 4);
@@ -638,6 +643,24 @@ const logBanner = (msg) => {
   log(msg, 6);
 }
 
+const logDebug = (msg) => {
+  if (getArgs().debug) {
+    log(msg, 7);
+  }
+}
+const logDebugTrace = (filename, method, e) => {
+  if (getArgs().debug) {
+    log(`ERROR in ${filename}`, 7);
+    log(`...method : ${method}`, 7);
+    log(`...message : ${e.message}`, 7);
+  }
+}
+const logDebugResponse = (response) => {
+  if (getArgs().debug) {
+    console.log(response);
+  }
+}
+
 const log = (msg, type) => {
   var prefix, msgContent, currentDateTime = moment(new Date()).format("HH:mm:ss");
 
@@ -658,7 +681,7 @@ const log = (msg, type) => {
   }
   if (type === 3) {
       prefix = figures.pointer.repeat(6);
-      msgContent = `\n${currentDateTime} - ${prefix} ${msg}\n`;
+      msgContent = `${currentDateTime} - ${prefix} ${msg}`;
       console.info(chalk.red(msgContent));
   }
   if (type === 4) {
@@ -680,6 +703,11 @@ const log = (msg, type) => {
       console.info(chalk.keyword('yellow')(figures.star.repeat(msgContent.length)));
       console.info('\n');
   }
+  if (type === 7) {
+    prefix = figures.pointer.repeat(10);
+    msgContent = `${currentDateTime} - ${prefix} ${msg}`;
+    console.info(chalk.keyword('yellow')(msgContent));
+  }
 }
 
 function logVersion() {
@@ -701,12 +729,6 @@ function logVersion() {
 
 
 
-
-
-
-
-
-
 module.exports.relativeCopy = relativeCopy;
 module.exports.relativeCopyEol = relativeCopyEol;
 module.exports.link = link;
@@ -743,9 +765,14 @@ module.exports.logTitle = logTitle;
 module.exports.logInfo = logInfo;
 module.exports.logSuccess = logSuccess;
 module.exports.logError = logError;
+module.exports.logErrorTrace = logErrorTrace;
 module.exports.logWarning = logWarning;
 module.exports.logAccent = logAccent;
 module.exports.logBanner = logBanner;
+module.exports.logDebug = logDebug;
+module.exports.logDebugTrace = logDebugTrace;
+module.exports.logDebugResponse = logDebugResponse;
+
 module.exports.replaceInFile = replaceInFile;
 module.exports.replaceInPath = replaceInPath;
 module.exports.sortArray = sortArray;