@eui/tools 6.20.5 → 6.20.7

package/.version.properties

@@ -1 +1 @@
-6.20.5
+6.20.7

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.20.7 (2024-08-07)
+
+##### Chores
+
+* **other:**
+  * add authenticate git option for standalone pkg - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([ad7b09ab](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ad7b09ab47c955b25467d3fe18b69e95e155b03e))
+
+* * *
+* * *
+## 6.20.6 (2024-08-07)
+
+##### Chores
+
+* **other:**
+  * add debugGitUpdates option in case of git failure pipeline side - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([d0a40904](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d0a40904f4666d008484e5c0dc7600521b8fd39b))
+
+* * *
+* * *
 ## 6.20.5 (2024-08-07)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/config/global.js

@@ -255,6 +255,7 @@ module.exports.updateConfig = (args = { project, projects, packages, packagesBra
 
 const getConvertedOptions = (config) => {
   let configOptions = {
+    GIT_HOST_REMOTE: null,
     DEVOPS_METADATA_REPOSITORY: null,
     DEVOPS_METADATA_LOCKS_REPOSITORY: null,
     DEVOPS_METADATA_PATH: null,
@@ -282,6 +283,16 @@ const getConvertedOptions = (config) => {
     AUDIT_STYLES_GATES: null
   }
 
+  // getting issues manager options
+  const gitHost = config && config.git;
+
+  if (gitHost) {
+    if (gitHost.remote) {
+      configOptions.GIT_HOST_REMOTE = gitHost.remote;
+    }
+  }
+
+
   // getting devops metadata options
   const devopsMetadata = config && config.devopsMetadata;
 

package/scripts/csdr/config/packages.js

@@ -234,6 +234,11 @@ module.exports.getPackagePaths = (pkg) => {
 
 module.exports.getStandalonePackage = () => {
   const basePath = path.join(process.cwd());
+  const { pkgName } = tools.getArgs();
+
+  if (!pkgName) {
+    throw new Error('pkgName not provided as pipeline argument');
+  }
 
   const packageJsonPath = path.join(basePath, 'package.json');
 
@@ -241,13 +246,14 @@ module.exports.getStandalonePackage = () => {
     throw new Error('PACKAGE_JSON_NOT_FOUND');
   }
 
-  // get package.json information (name, current version)
+  // get package.json information (current version)
   const packageJson = require(packageJsonPath);
 
   const pkg = {
     csdr: false,
     standalone: true,
-    ...packageJson,
+    name: pkgName,
+    version: packageJson.version,
     paths: {
       root: basePath,
       dist: path.join(basePath, 'dist'),

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

@@ -520,6 +520,11 @@ module.exports.runGitOperations = (pkg, version) => {
 
   console.log(branches);
 
+  // authenticate for standalone pkg
+  if (pkg.standalone) {
+    utils.git.authenticate(pkg, pkg.paths.root);
+  }
+
   if (pkg.remote && pkg.build && pkg.build.envTargetActive) {
     utils.tools.logInfo('Remote - with envTargetActive set - commit package only');
 

package/scripts/utils/git-utils.js

@@ -11,7 +11,7 @@ const { getPackageConfig } = require('./notification/config');
 // const versionUtils = require('./version-utils');
 
 // FETCH ARGS
-const { dryRun, git, debug, build, skipGitUpdates } = tools.getArgs();
+const { dryRun, git, debug, debugGitUpdates, build, skipGitUpdates } = tools.getArgs();
 
 
 const getLastTag = (folder) => {
@@ -103,9 +103,9 @@ const commitAndPush = (branch, message, folder) => {
     } catch (e2) {
       tools.logError('ERROR');
       console.log('ERROR!!!');
-      // if (debug) {
-      //   console.log(e2);
-      // }
+      if (debugGitUpdates) {
+        console.log(e2);
+      }
 
       try {
         tools.logInfo('Commit and push - second try - retrying pull & push');
@@ -113,7 +113,7 @@ const commitAndPush = (branch, message, folder) => {
         execa.sync('git', ['push', 'origin', branch], { cwd: folder });
 
       } catch (e3) {
-        if (debug) {
+        if (debugGitUpdates) {
           console.log(e3);
         }
         throw new Error(`Failed to push ${message} to ${folder}`);
@@ -264,6 +264,21 @@ const getGitHost = (externalRepo) => {
   return '';
 }
 
+const authenticate = (pkg, folder) => {
+  tools.logTitle('GIT authentication');
+
+  const auth = process.env.gituser && process.env.gitpassword ? `${process.env.gituser}:${process.env.gitpassword}@` : '';
+  const gitHost = configUtils.global.getConfigOptionsStandalone().GIT_HOST_REMOTE;
+
+  if (skipGitUpdates) {
+    tools.logInfo('DRY RUN - skipping');
+    tools.logInfo(`executing : for host: ${gitHost} - auth: ${auth} - pkgName: ${pkg.name}`);
+  } else {
+    execa.sync('git', ['remote', '--push', 'origin', `https://${auth}${gitHost}${pkg.name}.git`], { cwd: folder, stdio: 'inherit'});
+  }
+}
+
+
 
 const cloneRepo = (repoUri, folder, forced = false, shallow = false, externalRepo = false) => {
   if (!repoUri) {
@@ -428,6 +443,7 @@ module.exports.tagVersion = tagVersion;
 module.exports.mergeMasterToDevelop = mergeMasterToDevelop;
 module.exports.mergeSupportToSupportDevelop = mergeSupportToSupportDevelop;
 module.exports.cloneRepo = cloneRepo;
+module.exports.authenticate = authenticate;
 module.exports.checkout = checkout;
 module.exports.cloneAndCheckout = cloneAndCheckout;
 module.exports.getLastCommitAuthor = getLastCommitAuthor;