@payfit/nx-core 4.21.2-ephemeral-9fd0449.0 → 4.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payfit/nx-core",
-  "version": "4.21.2-ephemeral-9fd0449.0",
+  "version": "4.22.0",
   "type": "commonjs",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -11,6 +11,7 @@
     "directory": "packages/nx-core"
   },
   "dependencies": {
+    "args-tokenizer": "^0.3.0",
     "consola": "^3.4.2",
     "get-port": "^7.1.0",
     "ky": "^1.8.1",

package/src/executors/publisher/docker.js

@@ -2,21 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishDocker = publishDocker;
 const fs = require("node:fs");
-const consola_1 = require("consola");
 const aws_auth_1 = require("../../utils/aws-auth");
 const constants_1 = require("../../utils/constants");
 const docker_1 = require("../../utils/docker");
 const github_1 = require("../../utils/github");
+const logger_1 = require("../../utils/logger");
 async function publishDocker(options, context, version, projectRoot) {
     const projectDockerfile = `${projectRoot}/Dockerfile`;
     if (!fs.existsSync(projectDockerfile)) {
-        consola_1.consola.warn(`Dockerfile not found at ${projectDockerfile}, soft failing`);
+        logger_1.consola.warn(`Dockerfile not found at ${projectDockerfile}, soft failing`);
         return {
             success: true,
         };
     }
     if (!options.ecrRegistry) {
-        consola_1.consola.error('Dockerfile detected but No ECR registry provided, add "ecrRegistry" to your project.json metadata');
+        logger_1.consola.error('Dockerfile detected but No ECR registry provided, add "ecrRegistry" to your project.json metadata');
         return {
             success: false,
         };
@@ -27,11 +27,13 @@ async function publishDocker(options, context, version, projectRoot) {
         : process.env.AWS_ECR_REGISTRY;
     await (0, aws_auth_1.checkAwsAuth)();
     await (0, aws_auth_1.loginToEcr)(registry);
-    consola_1.consola.start('Building docker image with version ' + version);
+    logger_1.consola.box(`Publishing docker image to ${registry}/${options.ecrRegistry} with version ${version}`);
+    logger_1.consola.start('Building docker image');
     await (0, docker_1.buildDockerImage)(options.ecrRegistry, projectDockerfile, version, await (0, github_1.getSanitizedCurrentGitRepoUrl)(), await (0, github_1.getCurrentGitCommitSha)(), registry);
-    consola_1.consola.log(`Publishing docker image to ${registry}/${options.ecrRegistry} with version ${version}`);
+    logger_1.consola.success('Docker image built!');
+    logger_1.consola.start('Pushing docker image');
     await (0, aws_auth_1.pushImageToEcr)(options.ecrRegistry, version, registry);
-    consola_1.consola.success('Published the Docker image successfully!');
+    logger_1.consola.success('Docker image published successfully!');
     return {
         success: true,
     };

package/src/executors/publisher/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAcA,sCAqDC;AAnED,8BAA6B;AAG7B,qCAAiC;AAEjC,mDAA+E;AAC/E,qDAA2D;AAC3D,+CAAqD;AACrD,+CAG2B;AAGpB,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB;IAInB,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,iBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,gBAAgB,CAAC,CAAA;QAC1E,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAA;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,iBAAO,CAAC,KAAK,CACX,mGAAmG,CACpG,CAAA;QACD,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IAED,mEAAmE;IACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB;QACvC,CAAC,CAAC,+BAAmB;QACrB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAA;IAEhC,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAA;IAE1B,iBAAO,CAAC,KAAK,CAAC,qCAAqC,GAAG,OAAO,CAAC,CAAA;IAC9D,MAAM,IAAA,yBAAgB,EACpB,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,IAAA,sCAA6B,GAAE,EACrC,MAAM,IAAA,+BAAsB,GAAE,EAC9B,QAAQ,CACT,CAAA;IAED,iBAAO,CAAC,GAAG,CACT,8BAA8B,QAAQ,IAAI,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CACxF,CAAA;IACD,MAAM,IAAA,yBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAE5D,iBAAO,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAA;IAE3D,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAcA,sCAuDC;AArED,8BAA6B;AAI7B,mDAA+E;AAC/E,qDAA2D;AAC3D,+CAAqD;AACrD,+CAG2B;AAC3B,+CAA4C;AAGrC,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB;IAInB,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,gBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,gBAAgB,CAAC,CAAA;QAC1E,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAA;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,gBAAO,CAAC,KAAK,CACX,mGAAmG,CACpG,CAAA;QACD,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IAED,mEAAmE;IACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB;QACvC,CAAC,CAAC,+BAAmB;QACrB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAA;IAEhC,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAA;IAE1B,gBAAO,CAAC,GAAG,CACT,8BAA8B,QAAQ,IAAI,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CACxF,CAAA;IAED,gBAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;IACtC,MAAM,IAAA,yBAAgB,EACpB,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,IAAA,sCAA6B,GAAE,EACrC,MAAM,IAAA,+BAAsB,GAAE,EAC9B,QAAQ,CACT,CAAA;IACD,gBAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAEtC,gBAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,MAAM,IAAA,yBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC5D,gBAAO,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAA;IAEvD,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC"}

package/src/executors/publisher/executor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const consola_1 = require("consola");
+const logger_1 = require("../../utils/logger");
 const nx_1 = require("../../utils/nx");
 const docker_1 = require("./docker");
 const helm_1 = require("./helm");
@@ -10,9 +10,9 @@ const runExecutor = async (options, context) => {
         const projectRoot = projectGraph.data.root;
         const projectDist = await (0, nx_1.getDistForApp)(projectGraph);
         const version = (0, nx_1.getVersion)(projectDist);
-        consola_1.consola.log('version = ' + version);
         if (version.includes('-semver')) {
-            consola_1.consola.warn(`Version '${version}' should not be published (probably due a Nx bug), soft failing.`);
+            // this is while we have a weird Nx bug, trying to publish not affected apps by the release
+            logger_1.consola.warn(`Version '${version}' should not be published (probably due a Nx bug), soft failing.`);
             return {
                 success: true,
             };
@@ -21,7 +21,7 @@ const runExecutor = async (options, context) => {
         await (0, helm_1.publishHelm)(options, context, version, projectRoot, projectDist);
     }
     catch (error) {
-        consola_1.consola.error(error);
+        logger_1.consola.error(error);
         return {
             success: false,
         };

package/src/executors/publisher/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/executor.ts"],"names":[],"mappings":";;AACA,qCAAiC;AAEjC,uCAA+E;AAC/E,qCAAwC;AACxC,iCAAoC;AAGpC,MAAM,WAAW,GAGuB,KAAK,EAC3C,OAAiC,EACjC,OAAwB,EACxB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAA,wBAAmB,EAAC,OAAO,CAAC,CAAA;QACjD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAA;QAC1C,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,CAAC,CAAA;QACrD,MAAM,OAAO,GAAG,IAAA,eAAU,EAAC,WAAW,CAAC,CAAA;QAEvC,iBAAO,CAAC,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,CAAA;QACnC,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAChC,iBAAO,CAAC,IAAI,CACV,YAAY,OAAO,kEAAkE,CACtF,CAAA;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;aACd,CAAA;QACH,CAAC;QAED,MAAM,IAAA,sBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;QAC3D,MAAM,IAAA,kBAAW,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;IACxE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,iBAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/executor.ts"],"names":[],"mappings":";;AAEA,+CAA4C;AAC5C,uCAA+E;AAC/E,qCAAwC;AACxC,iCAAoC;AAGpC,MAAM,WAAW,GAGuB,KAAK,EAC3C,OAAiC,EACjC,OAAwB,EACxB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAA,wBAAmB,EAAC,OAAO,CAAC,CAAA;QACjD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAA;QAC1C,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,CAAC,CAAA;QACrD,MAAM,OAAO,GAAG,IAAA,eAAU,EAAC,WAAW,CAAC,CAAA;QAEvC,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAChC,2FAA2F;YAC3F,gBAAO,CAAC,IAAI,CACV,YAAY,OAAO,kEAAkE,CACtF,CAAA;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;aACd,CAAA;QACH,CAAC;QAED,MAAM,IAAA,sBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;QAC3D,MAAM,IAAA,kBAAW,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;IACxE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,gBAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}

package/src/executors/publisher/helm.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishHelm = publishHelm;
 const tslib_1 = require("tslib");
 const fs = require("node:fs");
-const consola_1 = require("consola");
 const aws_auth_1 = require("../../utils/aws-auth");
 const github_1 = require("../../utils/github");
 const helm_1 = require("../../utils/helm");
+const logger_1 = require("../../utils/logger");
 const tsh_1 = require("../../utils/tsh");
 async function publishHelm(options, context, version, projectRoot, projectDist) {
     const env_1 = { stack: [], error: void 0, hasError: false };
@@ -19,38 +19,43 @@ async function publishHelm(options, context, version, projectRoot, projectDist)
         if (!gitBranchName)
             throw new Error('Unable to get current Git branch');
         if (!fs.existsSync(projectHelmFolder)) {
-            consola_1.consola.warn(`.deploy folder not found at ${projectHelmFolder}, soft failing`);
+            logger_1.consola.warn(`.deploy folder not found at ${projectHelmFolder}, soft failing`);
             return {
                 success: true,
             };
         }
         if (!options.chartRegistry) {
-            consola_1.consola.error('Helm chart detected but no chart registry provided, add "chartRegistry" to your project.json metadata');
+            logger_1.consola.error('Helm chart detected but no chart registry provided, add "chartRegistry" to your project.json metadata');
             return {
                 success: false,
             };
         }
         await (0, aws_auth_1.checkAwsAuth)();
-        consola_1.consola.start(`Publishing Helm chart to ${options.chartRegistry}/${gitBranchName} with version ${version}`);
+        logger_1.consola.box(`Publishing Helm chart to ${options.chartRegistry}/${gitBranchName} with version ${version}`);
         // connect to the chartmuseum through teleport
         const proxyData = tslib_1.__addDisposableResource(env_1, await (0, tsh_1.getLocalPortForChartMuseum)(), false);
         await proxyData.isReady();
+        logger_1.consola.start('Building Helm chart');
         await (0, helm_1.setupTeleportProxyHelmChartFile)(projectHelmFolder, proxyData.port);
         await (0, helm_1.installHelmRepo)(projectHelmFolder);
         await (0, helm_1.patchImageTag)(valuesConfigPath, chartConfigPath, version);
         await (0, helm_1.packageHelm)(projectHelmFolder, version, destinationHelmFolder);
         await (0, helm_1.resetTeleportProxyHelmChartFile)(projectHelmFolder, proxyData.port);
+        logger_1.consola.success('Helm chart packaged!');
         const chartConfig = await (0, helm_1.getHelmChartFile)(projectHelmFolder);
         const packagedHelmChartName = `${chartConfig.name}-${version}.tgz`;
         const packagedHelmChartPath = `${destinationHelmFolder}${packagedHelmChartName}`;
+        logger_1.consola.start('Publishing Helm chart');
         // If ociEcrRegistry is provided, push to ECR using OCI format
         if (options.ociEcrRegistry) {
-            consola_1.consola.log(`Publishing Helm chart to OCI registry ${options.ociEcrRegistry}`);
-            return (0, helm_1.pushOciPackagedHelm)(packagedHelmChartPath, options.ociEcrRegistry);
+            logger_1.consola.log(`Publishing Helm chart to OCI registry ${options.ociEcrRegistry}`);
+            await (0, helm_1.pushOciPackagedHelm)(packagedHelmChartPath, options.ociEcrRegistry);
         }
-        // Otherwise, push to the chartmuseum as before
-        await (0, helm_1.pushPackagedHelm)(packagedHelmChartPath, packagedHelmChartName, options.chartRegistry, gitBranchName);
-        consola_1.consola.success('Published the Helm chart successfully!');
+        else {
+            // Otherwise, push to the chartmuseum as before
+            await (0, helm_1.pushPackagedHelm)(packagedHelmChartPath, packagedHelmChartName, options.chartRegistry, gitBranchName);
+        }
+        logger_1.consola.success('Helm chart published successfully!');
         return {
             success: true,
         };

package/src/executors/publisher/helm.js.map

@@ -1 +1 @@
-{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/helm.ts"],"names":[],"mappings":";;AAoBA,kCA2EC;;AA/FD,8BAA6B;AAG7B,qCAAiC;AAEjC,mDAAmD;AACnD,+CAAiE;AACjE,2CASyB;AACzB,yCAA4D;AAGrD,KAAK,UAAU,WAAW,CAC/B,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB,EACnB,WAAmB;;;QAInB,MAAM,iBAAiB,GAAG,GAAG,WAAW,UAAU,CAAA;QAClD,MAAM,gBAAgB,GAAG,GAAG,iBAAiB,cAAc,CAAA;QAC3D,MAAM,eAAe,GAAG,GAAG,iBAAiB,aAAa,CAAA;QACzD,MAAM,qBAAqB,GAAG,GAAG,WAAW,SAAS,CAAA;QACrD,MAAM,aAAa,GAAG,MAAM,IAAA,qCAA4B,GAAE,CAAA;QAE1D,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAEvE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtC,iBAAO,CAAC,IAAI,CACV,+BAA+B,iBAAiB,gBAAgB,CACjE,CAAA;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;aACd,CAAA;QACH,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3B,iBAAO,CAAC,KAAK,CACX,uGAAuG,CACxG,CAAA;YACD,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAA;QACH,CAAC;QAED,MAAM,IAAA,uBAAY,GAAE,CAAA;QAEpB,iBAAO,CAAC,KAAK,CACX,4BAA4B,OAAO,CAAC,aAAa,IAAI,aAAa,iBAAiB,OAAO,EAAE,CAC7F,CAAA;QACD,8CAA8C;QAC9C,MAAM,SAAS,0CAAG,MAAM,IAAA,gCAA0B,GAAE,QAAA,CAAA;QACpD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAA;QAEzB,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QACxE,MAAM,IAAA,sBAAe,EAAC,iBAAiB,CAAC,CAAA;QACxC,MAAM,IAAA,oBAAa,EAAC,gBAAgB,EAAE,eAAe,EAAE,OAAO,CAAC,CAAA;QAC/D,MAAM,IAAA,kBAAW,EAAC,iBAAiB,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAA;QACpE,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QAExE,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAgB,EAAC,iBAAiB,CAAC,CAAA;QAC7D,MAAM,qBAAqB,GAAG,GAAG,WAAW,CAAC,IAAI,IAAI,OAAO,MAAM,CAAA;QAClE,MAAM,qBAAqB,GAAG,GAAG,qBAAqB,GAAG,qBAAqB,EAAE,CAAA;QAEhF,8DAA8D;QAC9D,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,iBAAO,CAAC,GAAG,CACT,yCAAyC,OAAO,CAAC,cAAc,EAAE,CAClE,CAAA;YACD,OAAO,IAAA,0BAAmB,EAAC,qBAAqB,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;QAC3E,CAAC;QAED,+CAA+C;QAC/C,MAAM,IAAA,uBAAgB,EACpB,qBAAqB,EACrB,qBAAqB,EACrB,OAAO,CAAC,aAAa,EACrB,aAAa,CACd,CAAA;QAED,iBAAO,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAA;QAEzD,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAA;;;;;;;;;CACF"}
+{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/helm.ts"],"names":[],"mappings":"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"}

package/src/utils/aws-auth.d.ts

@@ -1,3 +1,4 @@
+import { Result } from 'tinyexec';
 /**
  * Return the AWS profile name to use in AWS cli commands
  */
@@ -30,11 +31,7 @@ export declare function getAuthWithOidcProfile(): Promise<string | boolean>;
  * @param registry
  * @returns A promise that resolves to the result of the login command
  */
-export declare function loginToEcr(registry: string): Promise<{
-    success: boolean;
-    stdout: string;
-    stderr: string;
-}>;
+export declare function loginToEcr(registry: string): Promise<Result>;
 /**
  * Check AWS CLI with the OIDC profile otherwise use the default credentials
  * @returns {string} the profile's name
@@ -48,6 +45,4 @@ export declare function checkAwsAuth(): Promise<string>;
  * @param registry
  * @returns A promise that resolves to the result of the push command
  */
-export declare function pushImageToEcr(repositoryName: string, version: string, registry: string): Promise<{
-    success: boolean;
-}>;
+export declare function pushImageToEcr(repositoryName: string, version: string, registry: string): Promise<Result>;

package/src/utils/aws-auth.js

@@ -6,6 +6,7 @@ exports.getAuthWithOidcProfile = getAuthWithOidcProfile;
 exports.loginToEcr = loginToEcr;
 exports.checkAwsAuth = checkAwsAuth;
 exports.pushImageToEcr = pushImageToEcr;
+const consola_1 = require("consola");
 const docker_1 = require("./docker");
 const exec_1 = require("./exec");
 let profileName = 'OIDC-PROFILE';
@@ -45,14 +46,10 @@ function getAwsCredentialsSet() {
  */
 async function getAuthWithOidcProfile() {
     try {
-        const profileExist = await (0, exec_1.exec_command)(`aws configure list-profiles | grep ${profileName}`);
-        if (profileExist.success) {
-            return profileExist.stdout;
-        }
-        return false;
+        const profileExist = await (0, exec_1.exec)(`aws configure list-profiles | grep ${profileName}`, false);
+        return profileExist.exitCode == 0 ? profileExist.stdout.trim() : false;
     }
     catch (e) {
-        console.error(e);
         return false;
     }
 }
@@ -63,7 +60,7 @@ async function getAuthWithOidcProfile() {
  * @returns A promise that resolves to the result of the login command
  */
 async function loginToEcr(registry) {
-    return (0, exec_1.exec_command)(`aws ecr get-login-password --profile ${profileName} --region eu-west-3 | ${await (0, docker_1.getDockerOrPodman)()} login --username AWS --password-stdin ${registry}`);
+    return (0, exec_1.exec)(`aws ecr get-login-password --region eu-west-3`).pipe(await (0, docker_1.getDockerOrPodman)(), `login --username AWS --password-stdin ${registry}`.split(' '));
 }
 /**
  * Check AWS CLI with the OIDC profile otherwise use the default credentials
@@ -72,11 +69,11 @@ async function loginToEcr(registry) {
 async function checkAwsAuth() {
     const profileExist = await getAuthWithOidcProfile();
     if (profileExist) {
-        console.log('OIDC profile found, using it');
+        consola_1.consola.log('OIDC profile found, using it');
         profileName = 'OIDC-PROFILE';
     }
     else if (getAwsCredentialsSet()) {
-        console.log('OIDC profile not found, using AWS_KEY_ID and AWS_SECRET_ACCESS_KEY');
+        consola_1.consola.log('OIDC profile not found, using AWS_KEY_ID and AWS_SECRET_ACCESS_KEY');
         profileName = 'default';
     }
     else {
@@ -92,7 +89,7 @@ async function checkAwsAuth() {
  * @param registry
  * @returns A promise that resolves to the result of the push command
  */
-function pushImageToEcr(repositoryName, version, registry) {
-    return (0, exec_1.exec_command)(`docker push ${registry}/${repositoryName}:${version}`);
+async function pushImageToEcr(repositoryName, version, registry) {
+    return (0, exec_1.exec)(`docker push ${registry}/${repositoryName}:${version}`);
 }
 //# sourceMappingURL=aws-auth.js.map

package/src/utils/aws-auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"aws-auth.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/aws-auth.ts"],"names":[],"mappings":";;AAQA,wCAEC;AAYD,oDAmBC;AAQD,wDAaC;AAQD,gCAIC;AAMD,oCAgBC;AAUD,wCAMC;AAhHD,qCAA4C;AAC5C,iCAAqC;AAErC,IAAI,WAAW,GAAG,cAAc,CAAA;AAEhC;;GAEG;AACH,SAAgB,cAAc;IAC5B,OAAO,WAAW,CAAA;AACpB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,oBAAoB;IAKlC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAA;IACjD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAA;IACzD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;IAC7C,IAAI,CAAC,WAAW,IAAI,CAAC,eAAe,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,kKAAkK,CACnK,CAAA;IACH,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACb,mIAAmI,CACpI,CAAA;IACH,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,CAAA;AACjD,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,sBAAsB;IAC1C,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAY,EACrC,sCAAsC,WAAW,EAAE,CACpD,CAAA;QACD,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,YAAY,CAAC,MAAM,CAAA;QAC5B,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAChB,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,UAAU,CAAC,QAAgB;IAC/C,OAAO,IAAA,mBAAY,EACjB,wCAAwC,WAAW,yBAAyB,MAAM,IAAA,0BAAiB,GAAE,0CAA0C,QAAQ,EAAE,CAC1J,CAAA;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,YAAY;IAChC,MAAM,YAAY,GAAG,MAAM,sBAAsB,EAAE,CAAA;IACnD,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;QAC3C,WAAW,GAAG,cAAc,CAAA;IAC9B,CAAC;SAAM,IAAI,oBAAoB,EAAE,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CACT,oEAAoE,CACrE,CAAA;QACD,WAAW,GAAG,SAAS,CAAA;IACzB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CACb,iLAAiL,CAClL,CAAA;IACH,CAAC;IACD,OAAO,WAAW,CAAA;AACpB,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,cAAc,CAC5B,cAAsB,EACtB,OAAe,EACf,QAAgB;IAEhB,OAAO,IAAA,mBAAY,EAAC,eAAe,QAAQ,IAAI,cAAc,IAAI,OAAO,EAAE,CAAC,CAAA;AAC7E,CAAC"}
+{"version":3,"file":"aws-auth.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/aws-auth.ts"],"names":[],"mappings":";;AAWA,wCAEC;AAYD,oDAmBC;AAQD,wDAUC;AAQD,gCAKC;AAMD,oCAgBC;AAUD,wCAMC;AAjHD,qCAAiC;AAGjC,qCAA4C;AAC5C,iCAA6B;AAE7B,IAAI,WAAW,GAAG,cAAc,CAAA;AAEhC;;GAEG;AACH,SAAgB,cAAc;IAC5B,OAAO,WAAW,CAAA;AACpB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,oBAAoB;IAKlC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAA;IACjD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAA;IACzD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;IAC7C,IAAI,CAAC,WAAW,IAAI,CAAC,eAAe,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,kKAAkK,CACnK,CAAA;IACH,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACb,mIAAmI,CACpI,CAAA;IACH,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,CAAA;AACjD,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,sBAAsB;IAC1C,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAA,WAAI,EAC7B,sCAAsC,WAAW,EAAE,EACnD,KAAK,CACN,CAAA;QACD,OAAO,YAAY,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAA;IACxE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,UAAU,CAAC,QAAgB;IAC/C,OAAO,IAAA,WAAI,EAAC,+CAA+C,CAAC,CAAC,IAAI,CAC/D,MAAM,IAAA,0BAAiB,GAAE,EACzB,yCAAyC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAC/D,CAAA;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,YAAY;IAChC,MAAM,YAAY,GAAG,MAAM,sBAAsB,EAAE,CAAA;IACnD,IAAI,YAAY,EAAE,CAAC;QACjB,iBAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;QAC3C,WAAW,GAAG,cAAc,CAAA;IAC9B,CAAC;SAAM,IAAI,oBAAoB,EAAE,EAAE,CAAC;QAClC,iBAAO,CAAC,GAAG,CACT,oEAAoE,CACrE,CAAA;QACD,WAAW,GAAG,SAAS,CAAA;IACzB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CACb,iLAAiL,CAClL,CAAA;IACH,CAAC;IACD,OAAO,WAAW,CAAA;AACpB,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,cAAc,CAClC,cAAsB,EACtB,OAAe,EACf,QAAgB;IAEhB,OAAO,IAAA,WAAI,EAAC,eAAe,QAAQ,IAAI,cAAc,IAAI,OAAO,EAAE,CAAC,CAAA;AACrE,CAAC"}

package/src/utils/docker.d.ts

@@ -1,3 +1,4 @@
+import { Result } from 'tinyexec';
 /**
  * Determines the available container management tool by checking for Docker and fallback to Podman if Docker is unavailable.
  *
@@ -13,10 +14,6 @@ export declare function getDockerOrPodman(): Promise<string>;
  * @param gitRepoUrl
  * @param commitSha
  * @param registry
- * @return {Promise<{success: boolean, stdout: string, stderr: string}>} A promise that resolves to an object containing the success status, stdout, and stderr of the command.
+ * @return {Promise<Result>}
  */
-export declare function buildDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string, registry: string): Promise<{
-    success: boolean;
-    stdout: string;
-    stderr: string;
-}>;
+export declare function buildDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string, registry: string): Promise<Result>;

package/src/utils/docker.js

@@ -10,7 +10,7 @@ const exec_1 = require("./exec");
  */
 async function getDockerOrPodman() {
     try {
-        await (0, exec_1.exec_command)('docker --version');
+        await (0, exec_1.exec)('docker --version');
         return 'docker';
     }
     catch (e) {
@@ -27,10 +27,14 @@ async function getDockerOrPodman() {
  * @param gitRepoUrl
  * @param commitSha
  * @param registry
- * @return {Promise<{success: boolean, stdout: string, stderr: string}>} A promise that resolves to an object containing the success status, stdout, and stderr of the command.
+ * @return {Promise<Result>}
  */
 async function buildDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha, registry) {
     const dockerOrPodman = await getDockerOrPodman();
-    return (0, exec_1.exec_command)(`${dockerOrPodman} buildx build -t ${registry}/${imageName}:${version} -f ${dockerfilePath} --secret id=NPM_TOKEN . --annotation org.opencontainers.image.source=${gitRepoUrl} --annotation org.opencontainers.image.revision=${commitSha} --build-arg DD_GIT_REPOSITORY_URL=${gitRepoUrl} --build-arg DD_GIT_COMMIT_SHA=${commitSha}`);
+    return (0, exec_1.exec)(`${dockerOrPodman} buildx build -t ${registry}/${imageName}:${version} -f ${dockerfilePath} --secret id=NPM_TOKEN . --annotation org.opencontainers.image.source=${gitRepoUrl} --annotation org.opencontainers.image.revision=${commitSha} --build-arg DD_GIT_REPOSITORY_URL=${gitRepoUrl} --build-arg DD_GIT_COMMIT_SHA=${commitSha}`, true, {
+        nodeOptions: {
+            stdio: 'inherit',
+        },
+    });
 }
 //# sourceMappingURL=docker.js.map

package/src/utils/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/docker.ts"],"names":[],"mappings":";;AAOA,8CAQC;AAaD,4CAYC;AAxCD,iCAAqC;AAErC;;;;GAIG;AACI,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,MAAM,IAAA,mBAAY,EAAC,kBAAkB,CAAC,CAAA;QACtC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;QAC9C,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,cAAsB,EACtB,OAAe,EACf,UAAkB,EAClB,SAAiB,EACjB,QAAgB;IAEhB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,mBAAY,EACjB,GAAG,cAAc,oBAAoB,QAAQ,IAAI,SAAS,IAAI,OAAO,OAAO,cAAc,yEAAyE,UAAU,mDAAmD,SAAS,sCAAsC,UAAU,kCAAkC,SAAS,EAAE,CACvU,CAAA;AACH,CAAC"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/docker.ts"],"names":[],"mappings":";;AAUA,8CAQC;AAaD,4CAkBC;AA9CD,iCAA6B;AAE7B;;;;GAIG;AACI,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,MAAM,IAAA,WAAI,EAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;QAC9C,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,cAAsB,EACtB,OAAe,EACf,UAAkB,EAClB,SAAiB,EACjB,QAAgB;IAEhB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,WAAI,EACT,GAAG,cAAc,oBAAoB,QAAQ,IAAI,SAAS,IAAI,OAAO,OAAO,cAAc,yEAAyE,UAAU,mDAAmD,SAAS,sCAAsC,UAAU,kCAAkC,SAAS,EAAE,EACtU,IAAI,EACJ;QACE,WAAW,EAAE;YACX,KAAK,EAAE,SAAS;SACjB;KACF,CACF,CAAA;AACH,CAAC"}

package/src/utils/exec.d.ts

@@ -1,7 +1,4 @@
-import type { TinyExec } from 'tinyexec';
-export declare function exec_command(command: string): Promise<{
-    success: boolean;
-    stdout: string;
-    stderr: string;
-}>;
-export declare const execTiny: TinyExec;
+import type { Options } from 'tinyexec';
+declare function execWrapperFromString(cmd: string, throwOnError?: boolean, options?: Partial<Options>): import("tinyexec").Result;
+export declare const exec: typeof execWrapperFromString;
+export {};

package/src/utils/exec.js

@@ -1,26 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execTiny = void 0;
-exports.exec_command = exec_command;
-const child_process_1 = require("child_process");
-const util_1 = require("util");
-const consola_1 = require("consola");
+exports.exec = void 0;
+const args_tokenizer_1 = require("args-tokenizer");
 const tinyexec_1 = require("tinyexec");
-async function exec_command(command) {
-    const { stdout, stderr } = await (0, util_1.promisify)(child_process_1.exec)(command);
-    consola_1.consola.log(stdout);
-    consola_1.consola.error(stderr);
-    const success = !stderr;
-    return { success, stdout, stderr };
-}
 function createLoggingExecWrapper(execFn) {
     return (command, args = [], options = {}) => {
-        consola_1.consola.log(`Running '${command} ${args.join(' ')}'...`);
-        return execFn(command, args, {
-            throwOnError: true,
-            ...options,
-        });
+        // consola.log(`Running '${command} ${args.join(' ')}'...`)
+        return execFn(command, args, options);
     };
 }
-exports.execTiny = createLoggingExecWrapper(tinyexec_1.x);
+// Accepts a single string, splits it, and runs with logging
+function execWrapperFromString(cmd, throwOnError = true, options = {}) {
+    const [command, ...args] = (0, args_tokenizer_1.tokenizeArgs)(cmd);
+    // Remove throwOnError from options if present, to avoid conflicts
+    const { throwOnError: _, ...restOptions } = options;
+    return createLoggingExecWrapper(tinyexec_1.x)(command, args, {
+        ...restOptions,
+        throwOnError,
+    });
+}
+exports.exec = execWrapperFromString;
 //# sourceMappingURL=exec.js.map

package/src/utils/exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/exec.ts"],"names":[],"mappings":";;;AAQA,oCAOC;AAfD,iDAAoC;AACpC,+BAAgC;AAIhC,qCAAiC;AACjC,uCAA4B;AAErB,KAAK,UAAU,YAAY,CAAC,OAAe;IAChD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IACzD,iBAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnB,iBAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAErB,MAAM,OAAO,GAAG,CAAC,MAAM,CAAA;IACvB,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;AACpC,CAAC;AAED,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,iBAAO,CAAC,GAAG,CAAC,YAAY,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACxD,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE;YAC3B,YAAY,EAAE,IAAI;YAClB,GAAG,OAAO;SACX,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAEY,QAAA,QAAQ,GAAG,wBAAwB,CAAC,YAAC,CAAC,CAAA"}
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/exec.ts"],"names":[],"mappings":";;;AAEA,mDAA6C;AAE7C,uCAA4B;AAE5B,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,2DAA2D;QAC3D,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACvC,CAAC,CAAA;AACH,CAAC;AAED,4DAA4D;AAC5D,SAAS,qBAAqB,CAC5B,GAAW,EACX,YAAY,GAAG,IAAI,EACnB,UAA4B,EAAE;IAE9B,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAA;IAC5C,kEAAkE;IAClE,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAA;IACnD,OAAO,wBAAwB,CAAC,YAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE;QAChD,GAAG,WAAW;QACd,YAAY;KACb,CAAC,CAAA;AACJ,CAAC;AAEY,QAAA,IAAI,GAAG,qBAAqB,CAAA"}

package/src/utils/github.js

@@ -8,8 +8,8 @@ const exec_1 = require("./exec");
  * Get sanitized current git branch name
  */
 async function getSanitizedCurrentGitBranch() {
-    const branchName = await (0, exec_1.exec_command)(`git branch --show-current`);
-    return branchName.success
+    const branchName = await (0, exec_1.exec)(`git branch --show-current`);
+    return branchName.exitCode == 0
         ? branchName.stdout
             .trim()
             .toLowerCase()
@@ -20,15 +20,15 @@ async function getSanitizedCurrentGitBranch() {
  * Get current commit sha
  */
 async function getCurrentGitCommitSha() {
-    const commitSha = await (0, exec_1.exec_command)(`git rev-parse HEAD`);
-    return commitSha.success ? commitSha.stdout.trim() : '';
+    const commitSha = await (0, exec_1.exec)(`git rev-parse HEAD`);
+    return commitSha.exitCode == 0 ? commitSha.stdout.trim() : '';
 }
 /**
  * Get sanitized current repo url
  */
 async function getSanitizedCurrentGitRepoUrl() {
-    const repoUrlExec = await (0, exec_1.exec_command)(`git config --get remote.origin.url`);
-    if (repoUrlExec.success) {
+    const repoUrlExec = await (0, exec_1.exec)(`git config --get remote.origin.url`);
+    if (repoUrlExec.exitCode == 0) {
         const repoUrlMatching = repoUrlExec.stdout.match(/github\.com[:/]PayFit\/[^/]+/);
         if (repoUrlMatching && repoUrlMatching.length > 0) {
             return `https://${repoUrlMatching[0].trim().replace(':', '/').replace('.git', '')}`;

package/src/utils/github.js.map

@@ -1 +1 @@
-{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/github.ts"],"names":[],"mappings":";;AAKA,oEAQC;AAKD,wDAGC;AAKD,sEAWC;AArCD,iCAAqC;AAErC;;GAEG;AACI,KAAK,UAAU,4BAA4B;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,2BAA2B,CAAC,CAAA;IAClE,OAAO,UAAU,CAAC,OAAO;QACvB,CAAC,CAAC,UAAU,CAAC,MAAM;aACd,IAAI,EAAE;aACN,WAAW,EAAE;aACb,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;QACjC,CAAC,CAAC,EAAE,CAAA;AACR,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,sBAAsB;IAC1C,MAAM,SAAS,GAAG,MAAM,IAAA,mBAAY,EAAC,oBAAoB,CAAC,CAAA;IAC1D,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;AACzD,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,6BAA6B;IACjD,MAAM,WAAW,GAAG,MAAM,IAAA,mBAAY,EAAC,oCAAoC,CAAC,CAAA;IAC5E,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAC9C,8BAA8B,CAC/B,CAAA;QACD,IAAI,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,OAAO,WAAW,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAA;QACrF,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAA;AACX,CAAC"}
+{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/github.ts"],"names":[],"mappings":";;AAKA,oEAQC;AAKD,wDAGC;AAKD,sEAWC;AArCD,iCAA6B;AAE7B;;GAEG;AACI,KAAK,UAAU,4BAA4B;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,WAAI,EAAC,2BAA2B,CAAC,CAAA;IAC1D,OAAO,UAAU,CAAC,QAAQ,IAAI,CAAC;QAC7B,CAAC,CAAC,UAAU,CAAC,MAAM;aACd,IAAI,EAAE;aACN,WAAW,EAAE;aACb,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;QACjC,CAAC,CAAC,EAAE,CAAA;AACR,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,sBAAsB;IAC1C,MAAM,SAAS,GAAG,MAAM,IAAA,WAAI,EAAC,oBAAoB,CAAC,CAAA;IAClD,OAAO,SAAS,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;AAC/D,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,6BAA6B;IACjD,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,oCAAoC,CAAC,CAAA;IACpE,IAAI,WAAW,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAC9C,8BAA8B,CAC/B,CAAA;QACD,IAAI,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,OAAO,WAAW,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAA;QACrF,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAA;AACX,CAAC"}

package/src/utils/helm.d.ts

@@ -32,11 +32,7 @@ export declare function resetTeleportProxyHelmChartFile(helmFolderPath: string,
  * Install all the helm repositories defined in the Chart config
  * @param helmFolderPath
  */
-export declare function installHelmRepo(helmFolderPath: string): Promise<{
-    success: boolean;
-    stdout: string;
-    stderr: string;
-}>;
+export declare function installHelmRepo(helmFolderPath: string): Promise<import("tinyexec").Output>;
 /**
  * Patch Docker image tag in values.yaml
  * @param valuesConfigPath
@@ -50,11 +46,7 @@ export declare function patchImageTag(valuesConfigPath: string, chartConfigPath:
  * @param version
  * @param destinationPath
  */
-export declare function packageHelm(helmFolderPath: string, version: string, destinationPath: string): Promise<{
-    success: boolean;
-    stdout: string;
-    stderr: string;
-}>;
+export declare function packageHelm(helmFolderPath: string, version: string, destinationPath: string): Promise<import("tinyexec").Output>;
 /**
  * Push the packaged Helm chart in the chartmuseum
  * @param packagedHelmChartFilePath
@@ -68,9 +60,5 @@ export declare function pushPackagedHelm(packagedHelmChartFilePath: string, pack
  * @param packagedHelmChartFilePath
  * @param ecrRegistry
  */
-export declare function pushOciPackagedHelm(packagedHelmChartFilePath: string, ecrRegistry: string): Promise<{
-    success: boolean;
-    stdout: string;
-    stderr: string;
-}>;
+export declare function pushOciPackagedHelm(packagedHelmChartFilePath: string, ecrRegistry: string): Promise<import("tinyexec").Output>;
 export {};

package/src/utils/helm.js

@@ -13,6 +13,7 @@ const process = require("node:process");
 const YAML = require("yaml");
 const aws_auth_1 = require("./aws-auth");
 const exec_1 = require("./exec");
+const logger_1 = require("./logger");
 const tshProxy = 'http://localhost';
 /**
  * Read & parse the Helm chart.yaml file
@@ -27,7 +28,7 @@ async function getHelmChartFile(helmFolderPath) {
  * @param tshPort
  */
 async function setupTeleportProxyHelmChartFile(helmFolderPath, tshPort) {
-    console.log(`Replacing charts.shared.payfit.tech -> localhost:${tshPort} for the Teleport proxy`);
+    logger_1.consola.log(`Replacing charts.shared.payfit.tech -> localhost:${tshPort} for the Teleport proxy`);
     let chartConfigStr = YAML.stringify(await getHelmChartFile(helmFolderPath));
     chartConfigStr = chartConfigStr.replace(/(https?:\/\/)charts(\.shared)?\.payfit\.tech/gi, `${tshProxy}:${tshPort}`);
     return fs.writeFileSync(`${helmFolderPath}/Chart.yaml`, chartConfigStr);
@@ -58,15 +59,15 @@ async function installHelmRepo(helmFolderPath) {
                 if (!process.env.CHARTMUSEUM_USERNAME ||
                     !process.env.CHARTMUSEUM_PASSWORD)
                     throw new Error('Missing CHARTMUSEUM_USERNAME, CHARTMUSEUM_PASSWORD in environment!');
-                await (0, exec_1.exec_command)(`helm repo add --username '${process.env.CHARTMUSEUM_USERNAME}' --password '${process.env.CHARTMUSEUM_PASSWORD}' '${repoName}' '${dep.repository}' --force-update`);
+                await (0, exec_1.exec)(`helm repo add --username '${process.env.CHARTMUSEUM_USERNAME}' --password '${process.env.CHARTMUSEUM_PASSWORD}' '${repoName}' '${dep.repository}' --force-update`);
             }
             else {
-                await (0, exec_1.exec_command)(`helm repo add '${repoName}' '${dep.repository}' --force-update`);
+                await (0, exec_1.exec)(`helm repo add '${repoName}' '${dep.repository}' --force-update`);
             }
-            await (0, exec_1.exec_command)(`helm repo update ${repoName}`);
+            await (0, exec_1.exec)(`helm repo update ${repoName}`);
         }
     }
-    return (0, exec_1.exec_command)(`helm dependency update ${helmFolderPath}`);
+    return (0, exec_1.exec)(`helm dependency update ${helmFolderPath}`);
 }
 /**
  * Patch Docker image tag in values.yaml
@@ -76,7 +77,7 @@ async function installHelmRepo(helmFolderPath) {
  */
 async function patchImageTag(valuesConfigPath, chartConfigPath, version) {
     if (fs.existsSync(valuesConfigPath)) {
-        console.log('Values files detected, trying to patch Docker image tag');
+        logger_1.consola.log('Values files detected, trying to patch Docker image tag');
         const values = YAML.parse(fs.readFileSync(valuesConfigPath, 'utf8'));
         const chart = YAML.parse(fs.readFileSync(chartConfigPath, 'utf8'));
         if (!chart.dependencies)
@@ -87,19 +88,19 @@ async function patchImageTag(valuesConfigPath, chartConfigPath, version) {
                 if (values[dep.alias]?.image?.tag) {
                     values[dep.alias].image.tag = version;
                     shouldUpdateFile = true;
-                    console.log(`Patched Docker image tag for the service ${dep.alias} successfully`);
+                    logger_1.consola.log(`Patched Docker image tag for the service ${dep.alias} successfully`);
                 }
                 else {
-                    console.warn(`Failed to find image.tag key for the service ${dep.alias}`);
+                    logger_1.consola.warn(`Failed to find image.tag key for the service ${dep.alias}`);
                 }
                 if (values[dep.alias]?.dbMigration?.image?.tag) {
                     values[dep.alias].dbMigration.image.tag = version;
                     shouldUpdateFile = true;
-                    console.log(`Patched Docker image tag for the dbMigration of the service ${dep.alias} successfully`);
+                    logger_1.consola.log(`Patched Docker image tag for the dbMigration of the service ${dep.alias} successfully`);
                 }
             }
             else {
-                console.warn(`Failed to find the service key ${dep.alias} in the values.yaml file`);
+                logger_1.consola.warn(`Failed to find the service key ${dep.alias} in the values.yaml file`);
             }
         }
         if (shouldUpdateFile) {
@@ -109,7 +110,7 @@ async function patchImageTag(valuesConfigPath, chartConfigPath, version) {
         }
     }
     else {
-        console.warn(`No values.yaml file detected at ${valuesConfigPath}, can't patch Docker image tag`);
+        logger_1.consola.warn(`No values.yaml file detected at ${valuesConfigPath}, can't patch Docker image tag`);
     }
 }
 /**
@@ -119,7 +120,7 @@ async function patchImageTag(valuesConfigPath, chartConfigPath, version) {
  * @param destinationPath
  */
 async function packageHelm(helmFolderPath, version, destinationPath) {
-    return (0, exec_1.exec_command)(`helm package ${helmFolderPath} --version ${version} --app-version ${version} --destination ${destinationPath}`);
+    return (0, exec_1.exec)(`helm package ${helmFolderPath} --version ${version} --app-version ${version} --destination ${destinationPath}`);
 }
 /**
  * Push the packaged Helm chart in the chartmuseum
@@ -132,9 +133,9 @@ async function pushPackagedHelm(packagedHelmChartFilePath, packagedHelmChartName
     if (!process.env.CHARTMUSEUM_BUCKET_NAME)
         throw new Error('Missing CHARTMUSEUM_BUCKET_NAME in environment!');
     const profile = (0, aws_auth_1.getProfileName)() === 'default' ? '' : `--profile ${(0, aws_auth_1.getProfileName)()}`;
-    await (0, exec_1.exec_command)(`aws s3 cp ${profile} --sse AES256 ${packagedHelmChartFilePath} s3://${process.env.CHARTMUSEUM_BUCKET_NAME}/${projectName}/${branch}/`);
+    await (0, exec_1.exec)(`aws s3 cp ${profile} --sse AES256 ${packagedHelmChartFilePath} s3://${process.env.CHARTMUSEUM_BUCKET_NAME}/${projectName}/${branch}/`);
     if (packagedHelmChartFilePath.includes('ephemeral')) {
-        await (0, exec_1.exec_command)(`aws s3api put-object-tagging ${profile} --bucket ${process.env.CHARTMUSEUM_BUCKET_NAME} --key ${projectName}/${branch}/${packagedHelmChartName} --tagging '{"TagSet": [{ "Key": "auto-purge", "Value": "true" }]}'`);
+        await (0, exec_1.exec)(`aws s3api put-object-tagging ${profile} --bucket ${process.env.CHARTMUSEUM_BUCKET_NAME} --key ${projectName}/${branch}/${packagedHelmChartName} --tagging '{"TagSet": [{ "Key": "auto-purge", "Value": "true" }]}'`);
     }
 }
 /**
@@ -146,6 +147,6 @@ async function pushOciPackagedHelm(packagedHelmChartFilePath, ecrRegistry) {
     // Login to ECR
     await (0, aws_auth_1.loginToEcr)(process.env.AWS_ECR_REGISTRY);
     // Push the Helm chart to ECR using OCI format
-    return (0, exec_1.exec_command)(`helm push ${packagedHelmChartFilePath} oci://${ecrRegistry}`);
+    return (0, exec_1.exec)(`helm push ${packagedHelmChartFilePath} oci://${ecrRegistry}`);
 }
 //# sourceMappingURL=helm.js.map

package/src/utils/helm.js.map

@@ -1 +1 @@
-{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/helm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/helm.ts"],"names":[],"mappings":"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"}

package/src/utils/logger.d.ts

@@ -0,0 +1 @@
+export declare const consola: import("consola").ConsolaInstance;

package/src/utils/logger.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.consola = void 0;
+const consola_1 = require("consola");
+exports.consola = (0, consola_1.createConsola)({
+    fancy: true,
+});
+//# sourceMappingURL=logger.js.map

package/src/utils/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/logger.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAE1B,QAAA,OAAO,GAAG,IAAA,uBAAa,EAAC;IACnC,KAAK,EAAE,IAAI;CACZ,CAAC,CAAA"}

package/src/utils/nx.js

@@ -5,7 +5,6 @@ exports.getProjectFromGraph = getProjectFromGraph;
 exports.getVersion = getVersion;
 const fs = require("node:fs");
 const devkit_1 = require("@nx/devkit");
-const consola_1 = require("consola");
 async function getDistForApp(project) {
     if (!project.data.targets?.build) {
         throw new Error('No build target found in project.json');
@@ -42,7 +41,6 @@ function getVersion(projectDist) {
     if (!fs.existsSync(`${projectDist}/package.json`)) {
         throw new Error(`package.json file not found at ${projectDist}`);
     }
-    consola_1.consola.log('getVersion at ' + projectDist);
     return (JSON.parse(fs.readFileSync(`${projectDist}/package.json`, 'utf8'))
         ?.version || null);
 }

package/src/utils/nx.js.map

@@ -1 +1 @@
-{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/nx.ts"],"names":[],"mappings":";;AASA,sCAiCC;AAED,kDAQC;AAOD,gCASC;AApED,8BAA6B;AAE7B,uCAImB;AACnB,qCAAiC;AAE1B,KAAK,UAAU,aAAa,CACjC,OAAgC;IAEhC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;IAErD,MAAM,YAAY,GAAG,UAAU;SAC5B,GAAG,CAAC,MAAM,CAAC,EAAE,CACZ,MAAM,CAAC,OAAO,CACZ,sBAAsB,EACtB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAC9C,CACF;SACA,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,sBAAa,CAAC,CAAC;SAC/D,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEvE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;IACpE,CAAC;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,qBAAqB,YAAY,kCAAkC,CACpE,CAAA;IACH,CAAC;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,SAAgB,mBAAmB,CACjC,OAAwB;IAExB,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;IAC3E,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IACD,OAAO,YAAY,CAAA;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,WAAW,eAAe,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,kCAAkC,WAAW,EAAE,CAAC,CAAA;IAClE,CAAC;IACD,iBAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,WAAW,CAAC,CAAA;IAC3C,OAAO,CACL,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,WAAW,eAAe,EAAE,MAAM,CAAC,CAAC;QAChE,EAAE,OAAO,IAAI,IAAI,CACpB,CAAA;AACH,CAAC"}
+{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/nx.ts"],"names":[],"mappings":";;AASA,sCAiCC;AAED,kDAQC;AAOD,gCAQC;AAnED,8BAA6B;AAE7B,uCAImB;AAGZ,KAAK,UAAU,aAAa,CACjC,OAAgC;IAEhC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;IAErD,MAAM,YAAY,GAAG,UAAU;SAC5B,GAAG,CAAC,MAAM,CAAC,EAAE,CACZ,MAAM,CAAC,OAAO,CACZ,sBAAsB,EACtB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAC9C,CACF;SACA,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,sBAAa,CAAC,CAAC;SAC/D,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEvE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;IACpE,CAAC;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,qBAAqB,YAAY,kCAAkC,CACpE,CAAA;IACH,CAAC;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,SAAgB,mBAAmB,CACjC,OAAwB;IAExB,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;IAC3E,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IACD,OAAO,YAAY,CAAA;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,WAAW,eAAe,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,kCAAkC,WAAW,EAAE,CAAC,CAAA;IAClE,CAAC;IACD,OAAO,CACL,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,WAAW,eAAe,EAAE,MAAM,CAAC,CAAC;QAChE,EAAE,OAAO,IAAI,IAAI,CACpB,CAAA;AACH,CAAC"}

package/src/utils/tsh.js

@@ -9,6 +9,7 @@ const workspace_root_1 = require("nx/src/utils/workspace-root");
 const zod_1 = require("zod");
 const exec_1 = require("./exec");
 const import_esm_1 = require("./import-esm");
+const logger_1 = require("./logger");
 const expectedProfileUrl = 'https://payfit.teleport.sh:443';
 const expectedAppName = 'charts-shared';
 const profile = zod_1.z.object({
@@ -19,7 +20,7 @@ const statusSchema = zod_1.z.object({
     profiles: zod_1.z.array(profile).optional(),
 });
 const getStatusOfTsh = async () => {
-    const { stdout } = await (0, exec_1.execTiny)('tsh', `status -f json`.split(' '));
+    const { stdout } = await (0, exec_1.exec)('tsh status -f json');
     return statusSchema.parse(JSON.parse(stdout));
 };
 async function isLoggedInToTsh() {
@@ -35,15 +36,11 @@ async function ensureIsLoggedInToTsh() {
     if (await isLoggedInToTsh()) {
         return true;
     }
-    await (0, exec_1.execTiny)('tsh', `login --proxy=${expectedProfileUrl} --auth=okta`.split(' '), {
-        throwOnError: true,
-    });
+    await (0, exec_1.exec)(`tsh login --proxy=${expectedProfileUrl} --auth=okta`);
     return await isLoggedInToTsh();
 }
 const getAppConfigOfTsh = async () => {
-    const { stdout } = await (0, exec_1.execTiny)('tsh', `apps config -f json --proxy=${expectedProfileUrl} ${expectedAppName}`.split(' '), {
-        throwOnError: true,
-    });
+    const { stdout } = await (0, exec_1.exec)(`tsh apps config -f json --proxy=${expectedProfileUrl} ${expectedAppName}`);
     return JSON.parse(stdout);
 };
 async function isConnectedToChartMuseum() {
@@ -59,9 +56,7 @@ async function ensureAppIsChartMuseum() {
     if (await isConnectedToChartMuseum()) {
         return true;
     }
-    await (0, exec_1.execTiny)('tsh', `apps login ${expectedAppName} --proxy=${expectedProfileUrl}`.split(' '), {
-        throwOnError: true,
-    });
+    await (0, exec_1.exec)(`tsh apps login ${expectedAppName} --proxy=${expectedProfileUrl}`);
     return await isConnectedToChartMuseum();
 }
 const getLocalPortForChartMuseum = async () => {
@@ -73,16 +68,16 @@ const getLocalPortForChartMuseum = async () => {
     const { default: ky } = await (0, import_esm_1.importKy)();
     const port = await getPort();
     const command = process.env.CI
-        ? `-i ./certs/identity --proxy payfit.teleport.sh:443 proxy app ${expectedAppName} --port ${port}`
-        : `proxy app ${expectedAppName} -p ${port}`;
-    const execHandle = (0, exec_1.execTiny)('tsh', command.split(' '), {
+        ? `tsh -i ./certs/identity --proxy payfit.teleport.sh:443 proxy app ${expectedAppName} --port ${port}`
+        : `tsh proxy app ${expectedAppName} -p ${port}`;
+    const execHandle = (0, exec_1.exec)(command, true, {
         nodeOptions: {
             cwd: workspace_root_1.workspaceRoot,
         },
     });
     const isReady = async () => {
         for await (const line of execHandle) {
-            console.log(`[TSH] ${line}`);
+            logger_1.consola.log(`[TSH] ${line}`);
             if (line.includes('Proxying connections')) {
                 return true;
             }
@@ -95,7 +90,7 @@ const getLocalPortForChartMuseum = async () => {
     });
     return {
         [Symbol.dispose]: async () => {
-            console.log(`Terminating tsh proxy on port ${port}`);
+            logger_1.consola.log(`Terminating tsh proxy on port ${port}`);
             execHandle.kill();
         },
         fetchClient,

package/src/utils/tsh.js.map

@@ -1 +1 @@
-{"version":3,"file":"tsh.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/tsh.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tsh.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/tsh.ts"],"names":[],"mappings":"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"}