@payfit/nx-core 0.0.0-e2e → 0.1.0-ephemeral-nx-common-packages-migration.0

package/README.md

@@ -1,13 +1,14 @@
 # @payfit/nx-core
 
-A Nx plugin that simplifies Docker image and Helm chart packaging and releases using Nx's versionActions feature.
+A Nx plugin that simplifies Docker image, Helm chart, lambda, frontend, and OpenTofu/Terraform module packaging and releases using Nx release & Nx's versionActions feature.
 
 ## Features
 
-- Automated Docker image building and publishing
+- Automated Docker image building and publishing to ECR
 - Helm chart packaging and versioning
-- AWS Lambda function packaging and deployment
-- Transparent version management through Nx's versionActions
+- AWS Lambda function packaging and deployment (ZIP and Docker-based)
+- Frontend publishing to S3 with CDN-optimized caching
+- Transparent version management through Nx's versionActions (CalVer by default)
 - Seamless integration with your Nx workspace
 - Auto setup using init generator to update your repository at plugin installation
 
@@ -32,7 +33,7 @@ This command will:
 
 Using the above command will setup your repo with the default recommended configuration. You are free to edit this configuration to your needs.
 
-It will also generate the CircleCI config file & Teleport file needed.
+It will also generate the CircleCI config file and GitHub Actions workflows needed.
 
 The plugin uses Nx's versionActions to handle versioning transparently. [We only override the semver calculation to switch it to calver (which you can opt out)](./src/scripts/version-actions.ts).
 
@@ -44,7 +45,7 @@ The plugin automatically handles:
 
 - Building Docker images
 - Tagging with appropriate versions
-- Publishing to your container registry
+- Publishing your container
 
 ### Helm Chart Release
 
@@ -77,83 +78,98 @@ The plugin automates the process of packaging and deploying AWS Lambda functions
 
 #### Lambda Configuration Parameters
 
-When using Lambda functions, you can configure the following parameters in your project's `project.json` file:
+When using Lambda functions, you must configure the following parameters in your project's `project.json` file:
 
 ```json
 {
   "metadata": {
-    "lambdaFunctions": ["your-lambda-registry"],
+    "lambdaFunctions": [
+      {
+        "name": "your-lambda",
+        "healthCheckPayload": "{\"key\": \"value\"}" // Escaped JSON string
+      }
+    ],
     "lambdaStacks": ["your-lambda-stack"],
     "lambdaBucket": "your-lambda-bucket",
-    "lambdaHealthCheckPayload": "your-lambda-payload-json-string-formatted"
+    "lambdaOciRepository": "your-lambda-oci-repository"
   }
 }
 ```
 
 These fields are used to:
 
-- `lambdaFunctions`: Lambda functions to deploy
-- `lambdaStacks`: Spacelift stacks deploying lambdas
+- `lambdaFunctions` **(required)**: Lambda functions to deploy with their name and healthcheck payload. The `healthCheckPayload` must be a valid JSON string.
+- `lambdaStacks` **(required)**: Spacelift stacks deploying lambdas
 - `lambdaBucket`: the S3 bucket where Lambda function zip archives are stored
-- `lambdaHealthCheckPayload`: Payload used for smoke tests invocation
+- `lambdaOciRepository`: the OCI repository used to publish lambda release candidates for Kargo
 
 If `lambdaBucket` is not specified, the plugin will fall back to the default bucket: `payfit-shared-lambda-artifacts`.
+If `lambdaOciRepository` is not specified for ZIP-based Lambdas, the plugin will fall back to the value of `lambdaFunctions[0].name`.
+
+> **Note**: For Docker-based Lambdas (projects with both `Dockerfile` and lambda metadata), `lambdaOciRepository` must be explicitly specified and the fallback does not apply.
 
 #### Lambda Detection
 
-The plugin automatically detects Lambda functions by looking for a `lambdaFunctions` metadata in your project root. When this metadata is present, the plugin will configure the necessary targets for packaging and deploying your Lambda function.
+The plugin automatically detects Lambda functions by looking for **both** `lambdaFunctions` and `lambdaStacks` metadata arrays in your project's `project.json`. When both are present and non-empty, the plugin will configure the necessary targets for packaging and deploying your Lambda function.
+
+### Frontend Release
+
+The plugin automates the process of packaging and deploying frontend applications:
+
+- Publishing built assets to an S3 bucket with proper cache headers
+- Creating an OCI artifact and pushing it to ECR for Kargo promotion
 
-## Configuration
+#### Frontend Configuration Parameters
 
-You'll need to add the following metadata to your project's `project.json` file:
+When using frontend projects, you can configure the following parameters in your project's `project.json` file:
 
 ```json
 {
   "metadata": {
-    "ecrRegistry": "your-app-name",
-    "chartRegistry": "your-chart-registry",
-    "ociEcrRegistry": "your-app-name",
-    "helmChartFolder": "your-helm-folder",
-    "lambdaFunctions": ["your-lambda-registry"],
-    "lambdaStacks": ["your-lambda-stack"],
-    "lambdaBucket": "your-lambda-bucket",
-    "lambdaHealthCheckPayload": "your-lambda-payload-json-string-formatted"
+    "frontendArtifactsBucketName": "your-frontend-bucket",
+    "frontendOciRepository": "your-frontend-oci-repository",
+    "frontendFilesWithoutCache": ["index.html", "favicon.ico"],
+    "frontendFoldersWithoutCache": ["config"]
   }
 }
 ```
 
 These fields are used to:
 
-- `ecrRegistry`: the ECR repository name for Docker images
-- `chartRegistry`: the Helm chart registry
-- `ociEcrRegistry`: the OCI registry for container images
-- `helmChartFolder`: the folder containing Helm chart files (Chart.yaml, values.yaml, etc.), defaults to `.deploy`
-- `lambdaStacks`: the spacelift stacks containing lambda to deploy
-- `lambdaFunctions`: the lambda functions to deploy
-- `lambdaBucket`: the S3 bucket where Lambda function zip archives are stored (defaults to `payfit-shared-lambda-artifacts`)
-- `lambdaHealthCheckPayload`: Payload used for smoke tests invocation before lambda being released
+- `frontendArtifactsBucketName` **(required)**: The S3 bucket where frontend assets are stored
+- `frontendOciRepository`: The OCI repository used to publish frontend release candidates for Kargo. Defaults to the project name.
+- `frontendFilesWithoutCache`: Files that should be served without cache headers (defaults to `["index.html", "favicon.ico"]`)
+- `frontendFoldersWithoutCache`: Folders that should be served without cache headers (defaults to `[]`)
 
 ## Automatic Release Target Inference
 
-The plugin automatically infers release targets for your projects based on the presence of deployment files:
+The plugin automatically infers release targets for your projects based on the presence of deployment files and metadata:
 
-1. **Docker Image Release**: If a `Dockerfile` exists in your project root, the plugin will automatically:
+1. **Docker Image Release**: If a `Dockerfile` exists in your project root **AND** `ecrRepository` metadata is set, the plugin will automatically:
    - Configure Docker image building and publishing
    - Set up version management for the image
    - Handle ECR repository integration
 
-2. **Helm Chart Release**: If a `Chart.yaml` exists in your Helm chart folder (defaults to `.deploy/Chart.yaml`), the plugin will automatically:
+2. **Helm Chart Release**: If a `Chart.yaml` exists in your Helm chart folder (defaults to `.deploy/Chart.yaml`) **AND** `chartRegistry` metadata is set, the plugin will automatically:
    - Configure Helm chart packaging and versioning
    - Set up chart publishing to your registry
    - Handle chart dependencies and updates
 
-3. **Lambda Function Release**: If a `.lambda` file exists in your project root, the plugin will automatically:
-   - Configure Lambda function packaging (zip archive creation)
+3. **Lambda Function Release**: If both `lambdaFunctions` and `lambdaStacks` metadata arrays are present and non-empty, the plugin will automatically:
+   - Configure Lambda function packaging (zip archive creation for non-Docker lambdas)
    - Set up S3 bucket uploading for the Lambda artifact
-   - Create and push an empty OCI artifact to ECR for versioning
+   - Trigger Spacelift stacks and run smoke tests
+   - Create and push an OCI artifact to ECR for versioning (for Kargo promotion)
+
+4. **Frontend Release**: If `frontendArtifactsBucketName` metadata is set, the plugin will automatically:
+   - Configure frontend asset publishing to S3
+   - Set up cache headers for optimal CDN caching
+   - Create and push an OCI artifact to ECR for versioning (for Kargo promotion)
 
 The inference of the `nx-release-publish` target is handled through Nx's plugin system, which automatically adds the necessary targets and version actions to your project configuration. You don't need to manually configure these targets.
 
+**Note**: For Terraform/OpenTofu module management (formatting, linting, validation), see the `@payfit/iac` plugin.
+
 ---
 
 # Debug locally

package/dist/src/executors/docker-build/executor.d.ts

@@ -0,0 +1,4 @@
+import { ExecutorContext } from '@nx/devkit';
+import { DockerBuildExecutorOptions, DockerBuildExecutorSchema } from './schema';
+declare const runExecutor: (options: DockerBuildExecutorOptions, context: ExecutorContext) => Promise<DockerBuildExecutorSchema>;
+export default runExecutor;

package/dist/src/executors/docker-build/executor.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("node:fs");
+const ecr_1 = require("../../utils/common/ecr");
+const github_1 = require("../../utils/common/github");
+const logger_1 = require("../../utils/common/logger");
+const docker_1 = require("../../utils/docker");
+const runExecutor = async (options, context) => {
+    const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
+    const projectDockerfile = `${projectRoot}/Dockerfile`;
+    const isCI = process.env.CI === 'true';
+    if (!fs.existsSync(projectDockerfile)) {
+        logger_1.consola.warn(`Dockerfile not found at ${projectDockerfile}, skipping`);
+        return { success: true };
+    }
+    if (!options.ecrRepository) {
+        logger_1.consola.error('Dockerfile detected but No ECR registry provided, add "ecrRepository" to your project.json metadata');
+        return { success: false };
+    }
+    const registry = {
+        url: options.isPublicRegistry
+            ? 'public.ecr.aws/payfit'
+            : (0, ecr_1.getAwsEcrRegistry)(),
+        name: options.isPublicRegistry ? 'public.ecr.aws' : (0, ecr_1.getAwsEcrRegistry)(),
+    };
+    const commitSha = await (0, github_1.getCurrentGitCommitSha)();
+    const sanitizedRepoUrl = await (0, github_1.getSanitizedCurrentGitRepoUrl)();
+    const tag = `ephemeral-sha-${commitSha}`;
+    if (options.isDryRun) {
+        logger_1.consola.box(`Would have published docker image located at ${projectDockerfile} to registry ${options.ecrRepository} with tag ${tag} but --dry-run is enabled`);
+        return { success: true };
+    }
+    if (isCI) {
+        await (0, ecr_1.ensureEcrAuth)(registry.name, options.isPublicRegistry);
+    }
+    // Build ephemeral sha tag (immutable)
+    logger_1.consola.box(`${isCI ? 'Building and pushing ephemeral' : 'Building locally'} image to ${isCI ? registry.url + '/' : ''}${options.ecrRepository}:${tag}`);
+    await (0, docker_1.buildAndPushDockerImage)(options.ecrRepository, projectDockerfile, tag, sanitizedRepoUrl, commitSha, registry.url, [], context.projectName, options.buildArgs, isCI);
+    return { success: true };
+};
+exports.default = runExecutor;
+//# sourceMappingURL=executor.js.map

package/dist/src/executors/docker-build/executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/docker-build/executor.ts"],"names":[],"mappings":";;AAAA,8BAA6B;AAI7B,gDAI+B;AAC/B,sDAGkC;AAClC,sDAAmD;AACnD,+CAA4D;AAG5D,MAAM,WAAW,GAGyB,KAAK,EAC7C,OAAmC,EACnC,OAAwB,EACxB,EAAE;IACF,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7E,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IACrD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM,CAAA;IAEtC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,gBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,YAAY,CAAC,CAAA;QACtE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,gBAAO,CAAC,KAAK,CACX,qGAAqG,CACtG,CAAA;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,QAAQ,GAAgB;QAC5B,GAAG,EAAE,OAAO,CAAC,gBAAgB;YAC3B,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,IAAA,uBAAiB,GAAE;QACvB,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAA,uBAAiB,GAAE;KACxE,CAAA;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IAC9D,MAAM,GAAG,GAAG,iBAAiB,SAAS,EAAE,CAAA;IAExC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,gBAAO,CAAC,GAAG,CACT,gDAAgD,iBAAiB,gBAAgB,OAAO,CAAC,aAAa,aAAa,GAAG,2BAA2B,CAClJ,CAAA;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IAED,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,IAAA,mBAAa,EAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAC9D,CAAC;IAED,sCAAsC;IACtC,gBAAO,CAAC,GAAG,CACT,GAAG,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC,kBAAkB,aAAa,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,aAAa,IAAI,GAAG,EAAE,CAC5I,CAAA;IAED,MAAM,IAAA,gCAAuB,EAC3B,OAAO,CAAC,aAAa,EACrB,iBAAiB,EACjB,GAAG,EACH,gBAAgB,EAChB,SAAS,EACT,QAAQ,CAAC,GAAG,EACZ,EAAE,EACF,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,SAAS,EACjB,IAAI,CACL,CAAA;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAC1B,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}

package/dist/src/executors/docker-build/schema.json

@@ -0,0 +1,29 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "version": 2,
+  "title": "Docker build executor",
+  "description": "Build and push ephemeral Docker image (ephemeral-sha-<commit>) with Buildx",
+  "type": "object",
+  "properties": {
+    "ecrRepository": {
+      "type": "string",
+      "description": "The ecr repository name (i.e. the image name)"
+    },
+    "isPublicRegistry": {
+      "type": "boolean",
+      "description": "Use AWS public ECR (us-east-1)",
+      "default": false
+    },
+    "isDryRun": {
+      "type": "boolean",
+      "description": "Do not build/push, only print what would happen",
+      "default": false
+    },
+    "buildArgs": {
+      "type": "string",
+      "description": "Build arguments to pass to Docker build",
+      "examples": ["NODE_VERSION=18.20.0"]
+    },
+    "required": ["ecrRepository"]
+  }
+}

package/dist/src/executors/preview-deploy/argocdOverride.d.ts

@@ -1,4 +1,4 @@
 /**
  * Updates the ArgoCD override configuration based on the target branch
  */
-export declare function updateArgoCDOverride(argocdOverride: Record<string, unknown>, targetBranchName: string): Record<string, unknown> | undefined;
+export declare function updateArgoCDOverride(argocdOverride: Record<string, unknown>, targetBranchName: string): Promise<Record<string, unknown> | undefined>;

package/dist/src/executors/preview-deploy/argocdOverride.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateArgoCDOverride = updateArgoCDOverride;
-const github_1 = require("../../utils/common/github");
+const github_1 = require("./github");
 /**
  * Updates the ArgoCD override configuration based on the target branch
  */
-function updateArgoCDOverride(argocdOverride, targetBranchName) {
+async function updateArgoCDOverride(argocdOverride, targetBranchName) {
     // Handle main/master branches - remove target revision
-    if ((0, github_1.isDefaultBranch)(targetBranchName)) {
+    if (await (0, github_1.isDefaultBranch)(targetBranchName)) {
         if (argocdOverride.targetRevision) {
             delete argocdOverride.targetRevision;
             return argocdOverride;

package/dist/src/executors/preview-deploy/argocdOverride.js.map

@@ -1 +1 @@
-{"version":3,"file":"argocdOverride.js","sourceRoot":"","sources":["../../../../src/executors/preview-deploy/argocdOverride.ts"],"names":[],"mappings":";;AAKA,oDAiBC;AAtBD,sDAA2D;AAE3D;;GAEG;AACH,SAAgB,oBAAoB,CAClC,cAAuC,EACvC,gBAAwB;IAExB,uDAAuD;IACvD,IAAI,IAAA,wBAAe,EAAC,gBAAgB,CAAC,EAAE,CAAC;QACtC,IAAI,cAAc,CAAC,cAAc,EAAE,CAAC;YAClC,OAAO,cAAc,CAAC,cAAc,CAAA;YACpC,OAAO,cAAc,CAAA;QACvB,CAAC;QACD,oDAAoD;QACpD,OAAM;IACR,CAAC;IAED,gDAAgD;IAChD,cAAc,CAAC,cAAc,GAAG,gBAAgB,CAAA;IAChD,OAAO,cAAc,CAAA;AACvB,CAAC"}
+{"version":3,"file":"argocdOverride.js","sourceRoot":"","sources":["../../../../src/executors/preview-deploy/argocdOverride.ts"],"names":[],"mappings":";;AAKA,oDAiBC;AAtBD,qCAA0C;AAE1C;;GAEG;AACI,KAAK,UAAU,oBAAoB,CACxC,cAAuC,EACvC,gBAAwB;IAExB,uDAAuD;IACvD,IAAI,MAAM,IAAA,wBAAe,EAAC,gBAAgB,CAAC,EAAE,CAAC;QAC5C,IAAI,cAAc,CAAC,cAAc,EAAE,CAAC;YAClC,OAAO,cAAc,CAAC,cAAc,CAAA;YACpC,OAAO,cAAc,CAAA;QACvB,CAAC;QACD,oDAAoD;QACpD,OAAM;IACR,CAAC;IAED,gDAAgD;IAChD,cAAc,CAAC,cAAc,GAAG,gBAAgB,CAAA;IAChD,OAAO,cAAc,CAAA;AACvB,CAAC"}

package/dist/src/executors/preview-deploy/executor.js

@@ -1,11 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const auth_app_1 = require("@octokit/auth-app");
-const rest_1 = require("@octokit/rest");
 const yaml = require("yaml");
 const logger_1 = require("../../utils/common/logger");
+const octokit_1 = require("../../utils/common/octokit");
 const argocdOverride_1 = require("./argocdOverride");
 const kargoPolicy_1 = require("./kargoPolicy");
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+/**
+ * Retry a function when it throws a 409 Conflict error, up to 5 times.
+ * Waits 2 seconds between retries.
+ */
+async function retryOnConflict(fn) {
+    const maxAttempts = 5;
+    const retryDelay = 2000;
+    let lastError;
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        try {
+            return await fn();
+        }
+        catch (error) {
+            lastError = error;
+            // Only retry on 409 Conflict errors
+            if (error?.status !== 409) {
+                throw error;
+            }
+            // Don't retry on the last attempt
+            if (attempt === maxAttempts - 1) {
+                throw error;
+            }
+            logger_1.consola.warn(`Conflict detected (409), retrying in ${retryDelay}ms (attempt ${attempt + 1}/${maxAttempts})`);
+            await sleep(retryDelay);
+        }
+    }
+    throw lastError;
+}
 function readFileYamlContent(file) {
     if (!file) {
         return undefined;
@@ -27,112 +57,99 @@ function readFileYamlContent(file) {
         throw new Error(`Failed to parse YAML file: ${error}`);
     }
 }
-function getEnvVar(name) {
-    const value = process.env[name];
-    if (!value) {
-        throw new Error(`Missing env var ${name}`);
-    }
-    return value;
-}
-const runExecutor = async (options) => {
-    logger_1.consola.box(`Start preview deploy switch for ${options.targetAppName} to target branch ${options.targetBranchName} on the ${options.targetEnv} env`);
-    const octokit = process.env.GITHUB_TOKEN
-        ? new rest_1.Octokit({ auth: process.env.GITHUB_TOKEN })
-        : new rest_1.Octokit({
-            authStrategy: auth_app_1.createAppAuth,
-            auth: {
-                appId: getEnvVar('GITHUB_APP_ID'),
-                privateKey: getEnvVar('GITHUB_PRIVATE_KEY'),
-                installationId: getEnvVar('GITHUB_INSTALLATION_ID'),
-            },
-        });
-    const argocdOverridePath = `apps/${options.targetAppName}/${options.targetEnv}/.argocd-override.yaml`;
-    const kargoPolicyPath = `.kargo/policy.yaml`;
-    const message = `chore(${options.targetAppName}): switch deployment branch to ${options.targetBranchName} on ${options.targetEnv}`;
-    // Retrieve both files - throw error if either doesn't exist
-    const [argocdOverrideFile, kargoPolicyFile] = await Promise.all([
-        octokit.repos
-            .getContent({
-            owner: 'PayFit',
-            repo: options.targetRepo,
-            path: argocdOverridePath,
-            ref: 'heads/main',
-        })
-            .catch(e => {
-            // we don't update this file if it does not exist as it's optional
-            if (e.status === 404) {
-                logger_1.consola.info(`${options.targetRepo}/${argocdOverridePath} not found, ignoring this file`);
+const getFileWithSha = async (octokit, owner, repo, path, optional = false) => {
+    const file = await octokit.repos
+        .getContent({
+        owner,
+        repo,
+        path,
+        ref: 'heads/main',
+    })
+        .catch(e => {
+        // we don't update this file if it does not exist as it's optional
+        if (e.status === 404) {
+            if (optional) {
+                logger_1.consola.info(`${repo}/${path} not found, ignoring this file`);
                 return undefined;
             }
-            throw e;
-        }),
-        octokit.repos
-            .getContent({
-            owner: 'PayFit',
-            repo: options.targetRepo,
-            path: kargoPolicyPath,
-            ref: 'heads/main',
-        })
-            .catch(e => {
-            if (e.status === 404) {
-                throw new Error(`${options.targetRepo}/${kargoPolicyPath} not found`);
+            else {
+                throw new Error(`${repo}/${path} not found`);
             }
-            throw e;
-        }),
-    ]);
-    let argocdOverrideYaml = readFileYamlContent(argocdOverrideFile);
-    let kargoPolicyYaml = readFileYamlContent(kargoPolicyFile);
-    if (argocdOverrideYaml)
-        argocdOverrideYaml = (0, argocdOverride_1.updateArgoCDOverride)(argocdOverrideYaml, options.targetBranchName);
-    kargoPolicyYaml = (0, kargoPolicy_1.updateKargoPolicy)(kargoPolicyYaml, options.targetBranchName, options.targetEnv, options.targetAppName);
-    if (!argocdOverrideYaml && !kargoPolicyYaml) {
-        logger_1.consola.warn('Everything is already setup correctly, skipping');
-        return {
-            success: true,
-        };
+        }
+        throw e;
+    });
+    if (!file) {
+        return undefined;
     }
-    // Convert back to YAML and base64
-    if (argocdOverrideYaml) {
-        const updatedArgocdYaml = yaml.stringify(argocdOverrideYaml);
-        const updatedArgocdContent = Buffer.from(updatedArgocdYaml).toString('base64');
-        await octokit.repos.createOrUpdateFileContents({
-            owner: 'PayFit',
-            repo: options.targetRepo,
-            path: argocdOverridePath,
-            message,
-            content: updatedArgocdContent,
-            branch: 'main',
-            sha: argocdOverrideFile.data.sha,
-            committer: {
-                name: 'github-actions[bot]',
-                email: 'github-actions[bot]@users.noreply.github.com',
-            },
-            author: {
-                name: 'github-actions[bot]',
-                email: 'github-actions[bot]@users.noreply.github.com',
-            },
-        });
+    const content = readFileYamlContent(file);
+    if (!content) {
+        if (optional) {
+            return undefined;
+        }
+        else {
+            throw new Error(`${repo}/${path} exists but contains invalid or empty YAML content`);
+        }
     }
-    if (kargoPolicyYaml) {
-        const updatedKargoYaml = yaml.stringify(kargoPolicyYaml);
-        const updatedKargoContent = Buffer.from(updatedKargoYaml).toString('base64');
-        await octokit.repos.createOrUpdateFileContents({
-            owner: 'PayFit',
-            repo: options.targetRepo,
-            path: kargoPolicyPath,
-            message,
-            content: updatedKargoContent,
-            branch: 'main',
-            sha: kargoPolicyFile.data.sha,
-            committer: {
-                name: 'github-actions[bot]',
-                email: 'github-actions[bot]@users.noreply.github.com',
-            },
-            author: {
-                name: 'github-actions[bot]',
-                email: 'github-actions[bot]@users.noreply.github.com',
-            },
-        });
+    return {
+        content,
+        sha: file.data.sha,
+    };
+};
+const updateFile = async (octokit, owner, repo, path, message, content, sha) => {
+    const updatedContent = Buffer.from(content).toString('base64');
+    return await octokit.repos.createOrUpdateFileContents({
+        owner,
+        repo,
+        path,
+        message,
+        content: updatedContent,
+        branch: 'main',
+        sha,
+        committer: {
+            name: 'github-actions[bot]',
+            email: 'github-actions[bot]@users.noreply.github.com',
+        },
+        author: {
+            name: 'github-actions[bot]',
+            email: 'github-actions[bot]@users.noreply.github.com',
+        },
+    });
+};
+const runExecutor = async (options) => {
+    logger_1.consola.box(`Start preview deploy switch for ${options.targetAppName} to target branch ${options.targetBranchName} on the ${options.targetEnv} env`);
+    const octokit = (0, octokit_1.OctokitAuth)();
+    const argocdOverridePath = `apps/${options.targetAppName}/${options.targetEnv}/.argocd-override.yaml`;
+    const kargoPolicyPath = `.kargo/policy.yaml`;
+    const message = `chore(${options.targetAppName}): switch deployment branch to ${options.targetBranchName} on ${options.targetEnv} [skip ci]`;
+    let hasUpdates = false;
+    // Update ArgoCD override file (optional)
+    await retryOnConflict(async () => {
+        const currentFile = await getFileWithSha(octokit, 'PayFit', options.targetRepo, argocdOverridePath, true);
+        if (!currentFile) {
+            return; // File doesn't exist (optional), skip
+        }
+        const updatedContent = await (0, argocdOverride_1.updateArgoCDOverride)(currentFile.content, options.targetBranchName);
+        if (!updatedContent) {
+            return; // No update needed
+        }
+        hasUpdates = true;
+        await updateFile(octokit, 'PayFit', options.targetRepo, argocdOverridePath, message, yaml.stringify(updatedContent), currentFile.sha);
+    });
+    // Update Kargo policy file (required)
+    await retryOnConflict(async () => {
+        const currentFile = await getFileWithSha(octokit, 'PayFit', options.targetRepo, kargoPolicyPath, false);
+        if (!currentFile) {
+            throw new Error(`Kargo policy file ${kargoPolicyPath} not found or contains invalid content`);
+        }
+        const updatedContent = await (0, kargoPolicy_1.updateKargoPolicy)(currentFile.content, options.targetBranchName, options.targetEnv, options.targetAppName);
+        if (!updatedContent) {
+            return; // No update needed
+        }
+        hasUpdates = true;
+        await updateFile(octokit, 'PayFit', options.targetRepo, kargoPolicyPath, message, yaml.stringify(updatedContent), currentFile.sha);
+    });
+    if (!hasUpdates) {
+        logger_1.consola.info('No updates needed, configuration is already correct');
     }
     logger_1.consola.success('Preview deploy switch succeed !');
     return {

package/dist/src/executors/preview-deploy/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/preview-deploy/executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/preview-deploy/executor.ts"],"names":[],"mappings":"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"}

package/dist/src/executors/preview-deploy/github.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Checks if the current branch is a default branch
+ */
+export declare function isDefaultBranch(branchName: string): Promise<boolean>;

package/dist/src/executors/preview-deploy/github.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDefaultBranch = isDefaultBranch;
+/**
+ * Checks if the current branch is a default branch
+ */
+async function isDefaultBranch(branchName) {
+    return branchName === 'main' || branchName === 'master';
+}
+//# sourceMappingURL=github.js.map

package/dist/src/executors/preview-deploy/github.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../../src/executors/preview-deploy/github.ts"],"names":[],"mappings":";;AAGA,0CAEC;AALD;;GAEG;AACI,KAAK,UAAU,eAAe,CAAC,UAAkB;IACtD,OAAO,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,QAAQ,CAAA;AACzD,CAAC"}

package/dist/src/executors/preview-deploy/kargoPolicy.d.ts

@@ -11,4 +11,4 @@ export interface KargoPolicy {
 /**
  * Updates the Kargo policy configuration based on the target branch
  */
-export declare function updateKargoPolicy(kargoPolicy: KargoPolicy, targetBranchName: string, targetEnv: string, targetAppName: string): KargoPolicy | undefined;
+export declare function updateKargoPolicy(kargoPolicy: KargoPolicy, targetBranchName: string, targetEnv: string, targetAppName: string): Promise<KargoPolicy | undefined>;

package/dist/src/executors/preview-deploy/kargoPolicy.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateKargoPolicy = updateKargoPolicy;
-const github_1 = require("../../utils/common/github");
+// Type definition for Kargo policy structure
+const github_1 = require("./github");
 /**
  * Ensures the service structure exists in the kargo policy
  * Returns true if any structure was created, false otherwise
@@ -49,7 +50,7 @@ function setEphemeralBranch(kargoPolicy, appName, env, branchName) {
 /**
  * Updates the Kargo policy configuration based on the target branch
  */
-function updateKargoPolicy(kargoPolicy, targetBranchName, targetEnv, targetAppName) {
+async function updateKargoPolicy(kargoPolicy, targetBranchName, targetEnv, targetAppName) {
     // Early return if service doesn't exist
     if (!kargoPolicy.services || !kargoPolicy.services[targetAppName]) {
         throw new Error('Unable to update kargo policy, service does not exist in the configuration');
@@ -57,7 +58,7 @@ function updateKargoPolicy(kargoPolicy, targetBranchName, targetEnv, targetAppNa
     let hasChanged = false;
     // Ensure structure exists and track if changes were made
     ensureServiceStructure(kargoPolicy, targetAppName, targetEnv);
-    if ((0, github_1.isDefaultBranch)(targetBranchName)) {
+    if (await (0, github_1.isDefaultBranch)(targetBranchName)) {
         // reset to default branch
         hasChanged = resetKargoPolicyForDefaultBranch(kargoPolicy, targetAppName, targetEnv);
     }