@payfit/nx-core 0.0.0-e2e → 0.0.0-semver

package/dist/src/scripts/version-actions.d.ts

@@ -1,8 +1,25 @@
-import JsVersionActions from '@nx/js/src/release/version-actions';
-declare class customVersionAction extends JsVersionActions {
+import { ProjectGraph, Tree } from '@nx/devkit';
+import { VersionActions } from 'nx/release';
+import { NxReleaseVersionConfiguration } from 'nx/src/config/nx-json';
+export default class customVersionAction extends VersionActions {
+    validManifestFilenames: string[];
+    readCurrentVersionFromSourceManifest(tree: Tree): Promise<{
+        currentVersion: string;
+        manifestPath: string;
+    } | null>;
+    readCurrentVersionFromRegistry(tree: Tree, currentVersionResolverMetadata: NxReleaseVersionConfiguration['currentVersionResolverMetadata']): Promise<{
+        currentVersion: string | null;
+        logText: string;
+    } | null>;
+    readCurrentVersionOfDependency(tree: Tree, projectGraph: ProjectGraph, dependencyProjectName: string): Promise<{
+        currentVersion: string | null;
+        dependencyCollection: string | null;
+    }>;
+    isLocalDependencyProtocol(versionSpecifier: string): Promise<boolean>;
+    updateProjectVersion(tree: Tree, newVersion: string): Promise<string[]>;
+    updateProjectDependencies(tree: Tree, projectGraph: ProjectGraph, dependenciesToUpdate: Record<string, string>): Promise<string[]>;
     calculateNewVersion(currentVersion: string | null, newVersionInput: string, newVersionInputReason: string, newVersionInputReasonData: Record<string, unknown>, preid: string): Promise<{
         newVersion: string;
         logText: string;
     }>;
 }
-export = customVersionAction;

package/dist/src/scripts/version-actions.js

@@ -1,7 +1,39 @@
 "use strict";
-const version_actions_1 = require("@nx/js/src/release/version-actions");
+Object.defineProperty(exports, "__esModule", { value: true });
+const release_1 = require("nx/release");
 const semver_1 = require("semver");
-class customVersionAction extends version_actions_1.default {
+class customVersionAction extends release_1.VersionActions {
+    async readCurrentVersionFromSourceManifest(tree) {
+        return {
+            currentVersion: '0.0.0',
+            manifestPath: 'apps/my-nest-app/project.json',
+        };
+    }
+    async readCurrentVersionFromRegistry(tree, currentVersionResolverMetadata) {
+        return {
+            currentVersion: '0.0.0',
+            logText: 'Current version from registry',
+        };
+    }
+    async readCurrentVersionOfDependency(tree, projectGraph, dependencyProjectName) {
+        return {
+            currentVersion: '0.0.0',
+            dependencyCollection: '0.0.0',
+        };
+    }
+    async isLocalDependencyProtocol(versionSpecifier) {
+        return false;
+    }
+    async updateProjectVersion(tree, newVersion) {
+        // Update the version in the VERSION file
+        const currentProject = this.projectGraphNode.name;
+        const versionFilePath = `dist/apps/${currentProject}/VERSION`;
+        tree.write(versionFilePath, newVersion);
+        return [];
+    }
+    async updateProjectDependencies(tree, projectGraph, dependenciesToUpdate) {
+        return [];
+    }
     async calculateNewVersion(currentVersion, newVersionInput, newVersionInputReason, newVersionInputReasonData, preid) {
         function formatDate() {
             const date = new Date();
@@ -10,32 +42,18 @@ class customVersionAction extends version_actions_1.default {
             const day = date.getDate();
             return `${year}${month}.${day}.`;
         }
-        function getNewVersionFromCurrentVersion(currentVersion, preid) {
+        function getNewVersionFromCurrentVersion(currentVersion) {
             const expectedPattern = formatDate();
-            const defaultVersion = `${expectedPattern}0`;
-            if (!currentVersion)
-                return defaultVersion;
-            // Extract base version and preid
-            const versionMatch = currentVersion.match(/^([0-9]{0,6}\.[0-9]{1,2}\.[0-9]*)(?:-([\w.-]+))?$/);
-            const matchedCurrentVersion = versionMatch ? versionMatch[1] : null;
-            const currentPreid = versionMatch ? versionMatch[2] : null;
-            const isMatchingExpectedPattern = matchedCurrentVersion?.startsWith(expectedPattern);
-            // making sure currentVersion is containing the current date
-            if (!isMatchingExpectedPattern)
-                return defaultVersion;
-            // If current version has a preid and new preid is empty, release current version
-            if (currentPreid && !preid.trim()) {
-                return matchedCurrentVersion;
-            }
-            return (0, semver_1.inc)(matchedCurrentVersion, 'patch');
+            return !currentVersion.startsWith(expectedPattern)
+                ? `${expectedPattern}0`
+                : (0, semver_1.inc)(currentVersion, 'patch');
         }
-        const baseVersion = getNewVersionFromCurrentVersion(currentVersion, preid);
-        const finalVersion = `${baseVersion}${preid.trim() ? '-' + preid : ''}`;
+        const finalVersion = `${getNewVersionFromCurrentVersion(currentVersion)}${preid.trim() ? '-' + preid : ''}`;
         return {
             newVersion: finalVersion,
-            logText: `❓📆 CalVer new version calculated ${finalVersion}`,
+            logText: `New version: ${finalVersion}`,
         };
     }
 }
-module.exports = customVersionAction;
+exports.default = customVersionAction;
 //# sourceMappingURL=version-actions.js.map

package/dist/src/scripts/version-actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../src/scripts/version-actions.ts"],"names":[],"mappings":";AAAA,wEAAiE;AACjE,mCAA4B;AAE5B,MAAM,mBAAoB,SAAQ,yBAAgB;IAChD,KAAK,CAAC,mBAAmB,CACvB,cAA6B,EAC7B,eAAuB,EACvB,qBAA6B,EAC7B,yBAAkD,EAClD,KAAa;QAKb,SAAS,UAAU;YACjB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;YAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA,CAAC,0BAA0B;YACrF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;YAE1B,OAAO,GAAG,IAAI,GAAG,KAAK,IAAI,GAAG,GAAG,CAAA;QAClC,CAAC;QAED,SAAS,+BAA+B,CACtC,cAA6B,EAC7B,KAAa;YAEb,MAAM,eAAe,GAAG,UAAU,EAAE,CAAA;YACpC,MAAM,cAAc,GAAG,GAAG,eAAe,GAAG,CAAA;YAE5C,IAAI,CAAC,cAAc;gBAAE,OAAO,cAAc,CAAA;YAE1C,iCAAiC;YACjC,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CACvC,mDAAmD,CACpD,CAAA;YACD,MAAM,qBAAqB,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YACnE,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAE1D,MAAM,yBAAyB,GAC7B,qBAAqB,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;YAEpD,4DAA4D;YAC5D,IAAI,CAAC,yBAAyB;gBAAE,OAAO,cAAc,CAAA;YAErD,iFAAiF;YACjF,IAAI,YAAY,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;gBAClC,OAAO,qBAAqB,CAAA;YAC9B,CAAC;YAED,OAAO,IAAA,YAAG,EAAC,qBAAqB,EAAE,OAAO,CAAC,CAAA;QAC5C,CAAC;QAED,MAAM,WAAW,GAAG,+BAA+B,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;QAC1E,MAAM,YAAY,GAAG,GAAG,WAAW,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;QAEvE,OAAO;YACL,UAAU,EAAE,YAAY;YACxB,OAAO,EAAE,qCAAqC,YAAY,EAAE;SAC7D,CAAA;IACH,CAAC;CACF;AAGD,iBAAS,mBAAmB,CAAA"}
+{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../src/scripts/version-actions.ts"],"names":[],"mappings":";;AACA,wCAA2C;AAE3C,mCAA4B;AAE5B,MAAqB,mBAAoB,SAAQ,wBAAc;IAE7D,KAAK,CAAC,oCAAoC,CACxC,IAAU;QAEV,OAAO;YACL,cAAc,EAAE,OAAO;YACvB,YAAY,EAAE,+BAA+B;SAC9C,CAAA;IACH,CAAC;IACD,KAAK,CAAC,8BAA8B,CAClC,IAAU,EACV,8BAA+F;QAE/F,OAAO;YACL,cAAc,EAAE,OAAO;YACvB,OAAO,EAAE,+BAA+B;SACzC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,8BAA8B,CAClC,IAAU,EACV,YAA0B,EAC1B,qBAA6B;QAK7B,OAAO;YACL,cAAc,EAAE,OAAO;YACvB,oBAAoB,EAAE,OAAO;SAC9B,CAAA;IACH,CAAC;IACD,KAAK,CAAC,yBAAyB,CAAC,gBAAwB;QACtD,OAAO,KAAK,CAAA;IACd,CAAC;IACD,KAAK,CAAC,oBAAoB,CACxB,IAAU,EACV,UAAkB;QAElB,yCAAyC;QACzC,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAA;QACjD,MAAM,eAAe,GAAG,aAAa,cAAc,UAAU,CAAA;QAC7D,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;QACvC,OAAO,EAAE,CAAA;IACX,CAAC;IACD,KAAK,CAAC,yBAAyB,CAC7B,IAAU,EACV,YAA0B,EAC1B,oBAA4C;QAE5C,OAAO,EAAE,CAAA;IACX,CAAC;IACD,KAAK,CAAC,mBAAmB,CACvB,cAA6B,EAC7B,eAAuB,EACvB,qBAA6B,EAC7B,yBAAkD,EAClD,KAAa;QAKb,SAAS,UAAU;YACjB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;YAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA,CAAC,0BAA0B;YACrF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;YAE1B,OAAO,GAAG,IAAI,GAAG,KAAK,IAAI,GAAG,GAAG,CAAA;QAClC,CAAC;QAED,SAAS,+BAA+B,CAAC,cAAsB;YAC7D,MAAM,eAAe,GAAG,UAAU,EAAE,CAAA;YACpC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,eAAe,CAAC;gBAChD,CAAC,CAAC,GAAG,eAAe,GAAG;gBACvB,CAAC,CAAC,IAAA,YAAG,EAAC,cAAc,EAAE,OAAO,CAAC,CAAA;QAClC,CAAC;QAED,MAAM,YAAY,GAAG,GAAG,+BAA+B,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;QAE3G,OAAO;YACL,UAAU,EAAE,YAAY;YACxB,OAAO,EAAE,gBAAgB,YAAY,EAAE;SACxC,CAAA;IACH,CAAC;CACF;AArFD,sCAqFC"}

package/dist/src/utils/{common/aws-auth.d.ts → aws-auth.d.ts}

@@ -1,4 +1,3 @@
-import { Result } from 'tinyexec';
 /**
  * Return the AWS profile name to use in AWS cli commands
  */
@@ -25,23 +24,16 @@ export declare function getAwsCredentialsSet(): {
  * @return {Promise<string | boolean>} The authentication details if the profile exists, or false if the profile does not exist.
  */
 export declare function getAuthWithOidcProfile(): Promise<string | boolean>;
-/**
- * Login to ECR using the specified registry or the AWS_ECR_REGISTRY environment variable
- *
- * @param registry
- * @param isPublicRegistry
- * @returns A promise that resolves to the result of the login command
- */
-export declare function loginToEcr(registry: string, isPublicRegistry?: boolean): Promise<Result>;
-/**
- * Verify that we have valid ECR credentials by checking the Docker config file
- *
- * @param registry The ECR registry to verify credentials for
- * @returns A promise that resolves to true if credentials are valid, false otherwise
- */
-export declare function verifyEcrCredentials(registry: string): Promise<boolean>;
+export declare function loginToEcr(): Promise<{
+    success: boolean;
+    stdout: string;
+    stderr: string;
+}>;
 /**
  * Check AWS CLI with the OIDC profile otherwise use the default credentials
  * @returns {string} the profile's name
  */
 export declare function checkAwsAuth(): Promise<string>;
+export declare function pushImageToEcr(repositoryName: string, version: string): Promise<{
+    success: boolean;
+}>;

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

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProfileName = getProfileName;
+exports.getAwsCredentialsSet = getAwsCredentialsSet;
+exports.getAuthWithOidcProfile = getAuthWithOidcProfile;
+exports.loginToEcr = loginToEcr;
+exports.checkAwsAuth = checkAwsAuth;
+exports.pushImageToEcr = pushImageToEcr;
+const docker_1 = require("./docker");
+const exec_1 = require("./exec");
+let profileName = 'OIDC-PROFILE';
+/**
+ * Return the AWS profile name to use in AWS cli commands
+ */
+function getProfileName() {
+    return profileName;
+}
+/**
+ * Retrieves the AWS credentials from environment variables.
+ * Ensures that `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, and `AWS_DEFAULT_REGION` are properly set.
+ * Throws an error if credentials or region are missing.
+ *
+ * @return {Object} An object containing AWS credentials.
+ * @return {string} return.accessKeyId The AWS Access Key ID.
+ * @return {string} return.secretAccessKey The AWS Secret Access Key.
+ * @return {string} return.region The AWS Region.
+ */
+function getAwsCredentialsSet() {
+    const accessKeyId = process.env.AWS_ACCESS_KEY_ID;
+    const secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY;
+    const region = process.env.AWS_DEFAULT_REGION;
+    if (!accessKeyId || !secretAccessKey) {
+        throw new Error('AWS credentials not found, please set AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables (or attach GLOBAL_ORG context if you are using CircleCI)');
+    }
+    if (!region) {
+        throw new Error('AWS region not found, please set AWS_DEFAULT_REGION environment variable (or attach GLOBAL_ORG context if you are using CircleCI)');
+    }
+    return { accessKeyId, secretAccessKey, region };
+}
+/**
+ * Retrieves the authentication information for a given OIDC profile.
+ * If the specified profile exists, it fetches the configuration; otherwise, it returns false.
+ *
+ * @return {Promise<string | boolean>} The authentication details if the profile exists, or false if the profile does not exist.
+ */
+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;
+    }
+    catch (e) {
+        console.error(e);
+        return false;
+    }
+}
+async function loginToEcr() {
+    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 ${process.env.AWS_ECR_REGISTRY}`);
+}
+/**
+ * Check AWS CLI with the OIDC profile otherwise use the default credentials
+ * @returns {string} the profile's name
+ */
+async function checkAwsAuth() {
+    const profileExist = await getAuthWithOidcProfile();
+    if (profileExist) {
+        console.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');
+        profileName = 'default';
+    }
+    else {
+        throw new Error('AWS credentials not found, please attach CORE-PLATFORM_SHARED_ENV context if you are using CircleCI or export AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables');
+    }
+    return profileName;
+}
+function pushImageToEcr(repositoryName, version) {
+    return (0, exec_1.exec_command)(`docker push ${process.env.AWS_ECR_REGISTRY}/${repositoryName}:${version}`);
+}
+//# sourceMappingURL=aws-auth.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"aws-auth.js","sourceRoot":"","sources":["../../../src/utils/aws-auth.ts"],"names":[],"mappings":";;AAQA,wCAEC;AAYD,oDAmBC;AAQD,wDAaC;AAED,gCAIC;AAMD,oCAgBC;AAED,wCAOC;AAnGD,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;AAEM,KAAK,UAAU,UAAU;IAC9B,OAAO,IAAA,mBAAY,EACjB,wCAAwC,WAAW,yBAAyB,MAAM,IAAA,0BAAiB,GAAE,0CAA0C,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAC9K,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,SAAgB,cAAc,CAC5B,cAAsB,EACtB,OAAe;IAEf,OAAO,IAAA,mBAAY,EACjB,eAAe,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,cAAc,IAAI,OAAO,EAAE,CAC3E,CAAA;AACH,CAAC"}

package/dist/src/utils/docker.d.ts

@@ -1,15 +1,19 @@
-import { Result } from 'tinyexec';
 /**
- * Builds and pushes a Docker image using the provided Dockerfile.
+ * Determines the available container management tool by checking for Docker and fallback to Podman if Docker is unavailable.
  *
- * @param imageName - The name of the image
- * @param dockerfilePath - Path to the Dockerfile
- * @param version - Version tag for the image
- * @param gitRepoUrl - Git repository URL for annotations
- * @param commitSha - Git commit SHA for annotations
- * @param registry - Docker registry URL
- * @param extraTags - Optional additional tags for the image
- * @param appName
- * @return {Promise<Result>}
+ * @return {Promise<string>} A promise that resolves to the string 'docker' if Docker is available, or 'podman' if Podman is used as a fallback.
  */
-export declare function buildAndPushDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string, registry: string, extraTags: string[], appName: string): Promise<Result>;
+export declare function getDockerOrPodman(): Promise<string>;
+/**
+ * Builds a Docker image using the provided Dockerfile.
+ *
+ * @param imageName The name of the image to build.
+ * @param dockerfilePath The path to the Dockerfile.
+ * @param version The version of the image to build.
+ * @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.
+ */
+export declare function buildDockerImage(imageName: string, dockerfilePath: string, version: string): Promise<{
+    success: boolean;
+    stdout: string;
+    stderr: string;
+}>;

package/dist/src/utils/docker.js

@@ -1,73 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildAndPushDockerImage = buildAndPushDockerImage;
-const exec_1 = require("./common/exec");
-const logger_1 = require("./common/logger");
-async function setupDockerBuilder(appName) {
-    const BUILDKIT_BUILDER_NAME = 'dockerContainerBuildkit'.concat(appName);
-    logger_1.consola.log(`Setting up Docker Buildx builder named ${BUILDKIT_BUILDER_NAME}...`);
-    const buildersResult = await (0, exec_1.exec)(`docker buildx ls`, {
-        throwOnError: true,
-    });
-    const hasBuildkitBuilder = buildersResult.stdout.includes(BUILDKIT_BUILDER_NAME);
-    const isBuildkitCurrentBuilder = buildersResult.stdout.includes(`${BUILDKIT_BUILDER_NAME}*`);
-    logger_1.consola.log(`Checking for existing buildx builders...`);
-    if (!hasBuildkitBuilder) {
-        // Create new buildkit builder
-        logger_1.consola.log(`Creating new buildkit builder...`);
-        await (0, exec_1.exec)(`docker buildx create \
-        --name ${BUILDKIT_BUILDER_NAME} \
-        --driver=docker-container \
-        --use`, {
-            throwOnError: true,
-        });
+exports.getDockerOrPodman = getDockerOrPodman;
+exports.buildDockerImage = buildDockerImage;
+const exec_1 = require("./exec");
+/**
+ * Determines the available container management tool by checking for Docker and fallback to Podman if Docker is unavailable.
+ *
+ * @return {Promise<string>} A promise that resolves to the string 'docker' if Docker is available, or 'podman' if Podman is used as a fallback.
+ */
+async function getDockerOrPodman() {
+    try {
+        await (0, exec_1.exec_command)('docker --version');
+        return 'docker';
     }
-    else if (!isBuildkitCurrentBuilder) {
-        logger_1.consola.log(`Existing buildkit builder found, but not current.`);
-        // Use existing buildkit builder
-        await (0, exec_1.exec)(`docker buildx use ${BUILDKIT_BUILDER_NAME}`, {
-            throwOnError: true,
-        });
+    catch (e) {
+        console.log('docker not found, trying podman');
+        return 'podman';
     }
-    logger_1.consola.info(`Buildx context is set to ${BUILDKIT_BUILDER_NAME}`);
-    return BUILDKIT_BUILDER_NAME;
 }
 /**
- * Builds and pushes a Docker image using the provided Dockerfile.
+ * Builds a Docker image using the provided Dockerfile.
  *
- * @param imageName - The name of the image
- * @param dockerfilePath - Path to the Dockerfile
- * @param version - Version tag for the image
- * @param gitRepoUrl - Git repository URL for annotations
- * @param commitSha - Git commit SHA for annotations
- * @param registry - Docker registry URL
- * @param extraTags - Optional additional tags for the image
- * @param appName
- * @return {Promise<Result>}
+ * @param imageName The name of the image to build.
+ * @param dockerfilePath The path to the Dockerfile.
+ * @param version The version of the image to build.
+ * @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.
  */
-async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha, registry, extraTags = [], appName) {
-    appName = appName.replaceAll('@', '-').replaceAll('/', '-');
-    const buildContextName = await setupDockerBuilder(appName);
-    // Build all tags including base version and extra tags
-    const tagArgs = [`${version}`, ...extraTags]
-        .map(tag => `-t ${registry}/${imageName}:${tag}`)
-        .join(' ');
-    const runCmd = `docker buildx build ${tagArgs} \
-      --builder ${buildContextName} \
-      -f ${dockerfilePath} \
-      --secret id=NPM_TOKEN \
-      --push \
-      --provenance=false \
-      --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)(runCmd, {
-        throwOnError: true,
-        nodeOptions: {
-            stdio: 'inherit',
-        },
-    });
+async function buildDockerImage(imageName, dockerfilePath, version) {
+    const dockerOrPodman = await getDockerOrPodman();
+    return (0, exec_1.exec_command)(`${dockerOrPodman} buildx build -t ${process.env.AWS_ECR_REGISTRY}/${imageName}:${version} -f ${dockerfilePath} --secret id=NPM_TOKEN  .`);
 }
 //# sourceMappingURL=docker.js.map

package/dist/src/utils/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/utils/docker.ts"],"names":[],"mappings":";;AA0DA,0DAoCC;AA5FD,wCAAoC;AACpC,4CAAyC;AAEzC,KAAK,UAAU,kBAAkB,CAAC,OAAe;IAC/C,MAAM,qBAAqB,GAAG,yBAAyB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACvE,gBAAO,CAAC,GAAG,CACT,0CAA0C,qBAAqB,KAAK,CACrE,CAAA;IACD,MAAM,cAAc,GAAG,MAAM,IAAA,WAAI,EAAC,kBAAkB,EAAE;QACpD,YAAY,EAAE,IAAI;KACnB,CAAC,CAAA;IACF,MAAM,kBAAkB,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,CACvD,qBAAqB,CACtB,CAAA;IACD,MAAM,wBAAwB,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,CAC7D,GAAG,qBAAqB,GAAG,CAC5B,CAAA;IACD,gBAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAA;IACvD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,8BAA8B;QAC9B,gBAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;QAC/C,MAAM,IAAA,WAAI,EACR;iBACW,qBAAqB;;cAExB,EACR;YACE,YAAY,EAAE,IAAI;SACnB,CACF,CAAA;IACH,CAAC;SAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACrC,gBAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAA;QAChE,gCAAgC;QAChC,MAAM,IAAA,WAAI,EAAC,qBAAqB,qBAAqB,EAAE,EAAE;YACvD,YAAY,EAAE,IAAI;SACnB,CAAC,CAAA;IACJ,CAAC;IAED,gBAAO,CAAC,IAAI,CAAC,4BAA4B,qBAAqB,EAAE,CAAC,CAAA;IAEjE,OAAO,qBAAqB,CAAA;AAC9B,CAAC;AAED;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,uBAAuB,CAC3C,SAAiB,EACjB,cAAsB,EACtB,OAAe,EACf,UAAkB,EAClB,SAAiB,EACjB,QAAgB,EAChB,YAAsB,EAAE,EACxB,OAAe;IAEf,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC3D,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAE1D,uDAAuD;IACvD,MAAM,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,EAAE,GAAG,SAAS,CAAC;SACzC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,QAAQ,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;SAChD,IAAI,CAAC,GAAG,CAAC,CAAA;IAEZ,MAAM,MAAM,GAAG,uBAAuB,OAAO;kBAC7B,gBAAgB;WACvB,cAAc;;;;qDAI4B,UAAU;uDACR,SAAS;0CACtB,UAAU;sCACd,SAAS;QACvC,CAAA;IAEN,OAAO,IAAA,WAAI,EAAC,MAAM,EAAE;QAClB,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE;YACX,KAAK,EAAE,SAAS;SACjB;KACF,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/utils/docker.ts"],"names":[],"mappings":";;AAOA,8CAQC;AAUD,4CASC;AAlCD,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;;;;;;;GAOG;AACI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,cAAsB,EACtB,OAAe;IAEf,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,mBAAY,EACjB,GAAG,cAAc,oBAAoB,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,SAAS,IAAI,OAAO,OAAO,cAAc,2BAA2B,CAC1I,CAAA;AACH,CAAC"}

package/dist/src/utils/exec.d.ts

@@ -0,0 +1,7 @@
+import type { TinyExec } from 'tinyexec';
+export declare function exec_command(command: string): Promise<{
+    success: boolean;
+    stdout: string;
+    stderr: string;
+}>;
+export declare const execTiny: TinyExec;

package/dist/src/utils/exec.js

@@ -0,0 +1,25 @@
+"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 tinyexec_1 = require("tinyexec");
+async function exec_command(command) {
+    const { stdout, stderr } = await (0, util_1.promisify)(child_process_1.exec)(command);
+    console.log(stdout);
+    console.error(stderr);
+    const success = !stderr;
+    return { success, stdout, stderr };
+}
+function createLoggingExecWrapper(execFn) {
+    return (command, args = [], options = {}) => {
+        console.log(`Running '${command} ${args.join(' ')}'...`);
+        return execFn(command, args, {
+            throwOnError: true,
+            ...options,
+        });
+    };
+}
+exports.execTiny = createLoggingExecWrapper(tinyexec_1.x);
+//# sourceMappingURL=exec.js.map

package/dist/src/utils/exec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../src/utils/exec.ts"],"names":[],"mappings":";;;AAOA,oCAOC;AAdD,iDAAoC;AACpC,+BAAgC;AAIhC,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,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnB,OAAO,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,OAAO,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"}

package/dist/src/utils/get-version.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Get the version of a project
+ * @param projectName
+ * @returns {string}
+ */
+export declare function getVersion(projectName: string): string;

package/dist/src/utils/get-version.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVersion = getVersion;
+const fs = require("node:fs");
+/**
+ * Get the version of a project
+ * @param projectName
+ * @returns {string}
+ */
+function getVersion(projectName) {
+    const versionFilePath = `dist/apps/${projectName}/VERSION`;
+    return fs.readFileSync(versionFilePath, 'utf8');
+}
+//# sourceMappingURL=get-version.js.map

package/dist/src/utils/get-version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-version.js","sourceRoot":"","sources":["../../../src/utils/get-version.ts"],"names":[],"mappings":";;AAOA,gCAGC;AAVD,8BAA6B;AAE7B;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,MAAM,eAAe,GAAG,aAAa,WAAW,UAAU,CAAA;IAC1D,OAAO,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;AACjD,CAAC"}

package/dist/src/utils/github.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Get sanitized current git branch name
+ */
+export declare function getSanitizedCurrentGitBranch(): Promise<string>;

package/dist/src/utils/github.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSanitizedCurrentGitBranch = getSanitizedCurrentGitBranch;
+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
+        ? branchName.stdout
+            .trim()
+            .toLowerCase()
+            .replace(/[^a-z0-9]/g, '')
+        : '';
+}
+//# sourceMappingURL=github.js.map

package/dist/src/utils/github.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../src/utils/github.ts"],"names":[],"mappings":";;AAKA,oEAQC;AAbD,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,YAAY,EAAE,EAAE,CAAC;QAC9B,CAAC,CAAC,EAAE,CAAA;AACR,CAAC"}

package/dist/src/utils/helm.d.ts

@@ -1,21 +1,8 @@
-interface ChartConfig {
-    name: string;
-    description: string;
-    type: string;
-    version: string;
-    dependencies?: ChartDependency[];
-}
-interface ChartDependency {
-    name: string;
-    alias?: string;
-    repository: string;
-    version: string;
-}
 /**
  * Read & parse the Helm chart.yaml file
  * @param helmFolderPath
  */
-export declare function getHelmChartFile(helmFolderPath: string): Promise<ChartConfig>;
+export declare function getHelmChartFile(helmFolderPath: string): Promise<any>;
 /**
  * Prepare the Chart.yaml config file for the Tsh proxy
  * @param helmFolderPath
@@ -32,33 +19,30 @@ 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<import("tinyexec").Output>;
-/**
- * Patch Docker image tag in values.yaml
- * @param valuesConfigPath
- * @param chartConfigPath
- * @param version
- */
-export declare function patchImageTag(valuesConfigPath: string, chartConfigPath: string, version: string): Promise<void>;
+export declare function installHelmRepo(helmFolderPath: string): Promise<{
+    success: boolean;
+    stdout: string;
+    stderr: string;
+}>;
 /**
  * Package the Helm chart
  * @param helmFolderPath
  * @param version
  * @param destinationPath
  */
-export declare function packageHelm(helmFolderPath: string, version: string, destinationPath: string): Promise<import("tinyexec").Output>;
+export declare function packageHelm(helmFolderPath: string, version: string, destinationPath: string): Promise<{
+    success: boolean;
+    stdout: string;
+    stderr: string;
+}>;
 /**
  * Push the packaged Helm chart in the chartmuseum
  * @param packagedHelmChartFilePath
- * @param packagedHelmChartName
  * @param projectName
  * @param branch
  */
-export declare function pushPackagedHelm(packagedHelmChartFilePath: string, packagedHelmChartName: string, projectName: string, branch: string): Promise<void>;
-/**
- * Push the packaged Helm chart to an OCI-compatible ECR repository
- * @param packagedHelmChartFilePath
- * @param ecrRegistry
- */
-export declare function pushOciPackagedHelm(packagedHelmChartFilePath: string, ecrRegistry: string): Promise<import("tinyexec").Output>;
-export {};
+export declare function pushPackagedHelm(packagedHelmChartFilePath: string, projectName: string, branch: string): Promise<{
+    success: boolean;
+    stdout: string;
+    stderr: string;
+}>;