@docupace/pipeline 1.0.1-2.ervinsUpdate2.6 → 1.0.1

package/src/next/cli.js

@@ -4,174 +4,56 @@ import { Command } from 'commander';
 import { pull } from './pull.js';
 import { sonar } from './sonar.js';
 import { publish } from './publish.js';
-import { deployFromSite } from './deploy.js';
+import { deploy } from './deploy.js';
 import { deployTemplate } from './deploy.js';
 import { copy } from './copy.js';
-import { vaultAddSiteData } from './vault.js';
-import { addApacheSite } from './apache.js';
-import { haproxySync }  from './haproxy.js';
-import { connectClone } from './connect.js';
-import dotenv from 'dotenv';
-
-dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
 
 const program = new Command();
 
 // GIT SHA computation
 import { $ } from 'zx';
-import {deployConnect, deployCore} from './jenkins.js';
-import { runPipeline } from './pipline.js';
-
 const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
 
 program
-  .command('pull <imageName>')
-  .description('Pull a Docker image from the registry')
-  .action(async (imageName) => {
-    await pull(imageName);
-  });
-
-program
-  .command('sonar')
-  .description('Run Sonar analysis')
-  .action(async () => {
-    await sonar(GIT_SHA);
-  });
-
-program
-.command('addApacheSite')
-.description('Add site to apache')
-.action(async () => {
-  await addApacheSite();
-});
-
-program
-.command('connectClone')
-.description('Clone connect site')
-.action(async () => {
-  await connectClone();
-});
-
-
-program
-.command('haproxySync')
-.description('Sync haproxy config')
-.action(async () => {
-  await haproxySync();
-});
-
-
-
-program
-  .command('vaultAddSiteData')
-  .description('Add m2m auth0 data to vault')
-  .requiredOption('-s, --site-name <siteName>', 'Site name')
-  .action(async (options) => {
-    const { siteName,  } = options;
-    await vaultAddSiteData(siteName);
-  });
-
-program
-  .command('publish')
-  .description('Publish a Docker image')
-  .action(async () => {
-    await publish(GIT_SHA);
-  });
-
-program
-  .command('deploy-from-site')
-  .description('Deploy an application for a specific site')
-  .requiredOption('-f, --from-env <fromEnv>', 'Source environment')
-  .requiredOption('-t, --to-env <toEnv>', 'Target environment')
-  .requiredOption('-F, --from-site <fromSite>', 'Source site')
-  .requiredOption('-T, --to-site <toSite>', 'Target site')
-  .option('-c, --deploy-core <deployCore>', 'Deploy Core', 'false')
-  .action(async (options) => {
-    const { fromEnv, fromSite, toEnv, toSite, deployCore } = options;
-    await deployFromSite(fromEnv, fromSite, toEnv, toSite, deployCore);
-  });
+    .command('pull <imageName>')
+    .description('Pull a Docker image from the registry')
+    .action(async (imageName) => {
+        await pull(imageName);
+    });
 
 program
-  .command('deployTemplate <site>')
-  .description('Deploy an application for a specific site')
-  .action(async (site) => {
-    await deployTemplate(site);
-  });
+    .command('sonar')
+    .description('Run Sonar analysis')
+    .action(async () => {
+        await sonar(GIT_SHA);
+    });
 
 program
-  .command('deploy-core <env> <site>')
-  .description('Deploy Core')
-  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
-  .option('-b, --branch <branch>', 'Branch', 'master')
-  .action(async (env, site, options) => {
-    await deployCore(env, site, options.liquibase, options.branch);
-  });
+    .command('publish')
+    .description('Publish a Docker image')
+    .action(async () => {
+        await publish(GIT_SHA);
+    });
 
 program
-  .command('deploy-connect <env> <site>')
-  .description('Deploy Core')
-  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
-  .option('-b, --branch <branch>', 'Branch', 'master')
-  .action(async (env, site, options) => {
-    await deployConnect(env, site, options.liquibase, options.branch);
-  });
+    .command('deploy <application> <site>')
+    .description('Deploy an application for a specific site')
+    .action(async (application, site) => {
+        await deploy(application, site);
+    });
 
 program
-  .command('deploy-core-pipeline <env> <site>')
-  .description('Deploy Core')
-  .option('-l, --liquibase <liquibase>', 'Application name', 'true')
-  .option('-b, --branch <branch>', 'Branch', 'master')
-  .action(async (env, site, options) => {
-    await runPipeline('site-deploy', 'deploy-core', 'main', {
-      ENV: env,
-      SITE: site,
-      LIQUIBASE: options.liquibase,
-      BRANCH: options.branch,
+    .command('deployTemplate <site>')
+    .description('Deploy an application for a specific site')
+    .action(async (site) => {
+        await deployTemplate(site);
     });
-  });
-
-
-  program
-  .command('copy')
-  .description('Copy a Docker image between registries')
-  .requiredOption('-a, --application <application>', 'Application name')
-  .requiredOption('-f, --from-env <fromEnv>', 'Source environment')
-  .requiredOption('-t, --to-env <toEnv>', 'Target environment')
-  .requiredOption('-g, --tag <tag>', 'Image tag')
-  .action(async (options) => {
-    const { application, fromEnv, toEnv, tag } = options;
-    await copy(application, fromEnv, toEnv, tag);
-  });
 
 program
-  .command('run-pipeline')
-  .description('Trigger a pipeline by name')
-  .requiredOption('-r, --repository <repository>', 'Repository name')
-  .requiredOption('-p, --pipeline-name <pipelineName>', 'Pipeline name')
-  .requiredOption('-b, --branch <branch>', 'Branch name')
-  .option(
-    '-v, --variables <key=value>',
-    'Pipeline variable as key=value pair',
-    (value, previous) => {
-      const [key, val] = value.split('=');
-      if (!key || val === undefined) {
-        throw new Error(`Invalid variable format: ${value}. Use key=value.`);
-      }
-      return { ...previous, [key]: val };
-    },
-    {},
-  )
-  .option('-w, --wait', 'Wait for the pipeline to complete', false) // Defaults to false
-  .action(async (cmdObj) => {
-    try {
-      const { repository, pipelineName, branch, variables, wait } = cmdObj;
-
-      // Call the triggerPipelineByName function
-      await runPipeline(repository, pipelineName, branch, variables, wait);
-    } catch (error) {
-      console.error('Error triggering pipeline:', error.message);
-      process.exit(1);
-    }
-  });
+    .command('copy')
+    .description('Copy a Docker image between registries')
+    .action(async () => {
+        await copy();
+    });
 
 program.parse(process.argv);

package/src/next/copy.js

@@ -1,30 +1,27 @@
 import { $ } from 'zx';
-import { appInfo, getEnvInfo, jfRegistryUrl } from './config.js';
+
 
 /*
     TARGET_ENV
     PUBLISH_TAG
     REPOSITORY_NAME
  */
-export async function copy(application, fromEnv, toEnv, tag) {
-  const envInfo = getEnvInfo();
-  const repositoryName = appInfo[application].repositoryName;
-  const fromRegistry = `${jfRegistryUrl}/${repositoryName}-${fromEnv}-docker-local`;
-  const toRegistry = `${jfRegistryUrl}/${repositoryName}-${toEnv}-docker-local`;
-  const imageName = `${repositoryName}:${tag}`;
-  const fromFullImageName = `${fromRegistry}/${imageName}`;
-  const toFullImageName = `${toRegistry}/${imageName}`;
+export async function copy() {
+    const JF_REGISTRY_URL = 'registry.paperout.com';
+    const SOURCE_REGISTRY = `${JF_REGISTRY_URL}/${process.env.REPOSITORY_NAME}-dev-docker-local`;
+    const TARGET_REGISTRY = `${JF_REGISTRY_URL}/${process.env.REPOSITORY_NAME}-${process.env.TARGET_ENV}-docker-local`;
+    const IMAGE_NAME = `${process.env.REPOSITORY_NAME}:${process.env.PUBLISH_TAG}`;
+    const SOURCE_FULL_IMAGE_NAME = `${SOURCE_REGISTRY}/${IMAGE_NAME}`;
+    const TARGET_FULL_IMAGE_NAME = `${TARGET_REGISTRY}/${IMAGE_NAME}`;
 
-  console.log(
-    `Copying Docker image: ${fromFullImageName} -> ${toFullImageName}`,
-  );
+    console.log(`Copying Docker image: ${SOURCE_FULL_IMAGE_NAME} -> ${TARGET_FULL_IMAGE_NAME}`);
 
-  // Login to source registry
-  await $`echo ${envInfo[fromEnv].jfrog.password} | docker login --username ${envInfo[fromEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
-  await $`docker pull ${fromFullImageName}`;
-  await $`docker tag ${fromFullImageName} ${toFullImageName}`;
+    // Login to source registry
+    await $`echo ${process.env.JF_REGISTRY_PASSWORD_DEV} | docker login --username ${process.env.JF_REGISTRY_USER_DEV} --password-stdin ${JF_REGISTRY_URL}`;
+    await $`docker pull ${SOURCE_FULL_IMAGE_NAME}`;
+    await $`docker tag ${SOURCE_FULL_IMAGE_NAME} ${TARGET_FULL_IMAGE_NAME}`;
 
-  // Login to target registry
-  await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
-  await $`docker push ${toFullImageName}`;
+    // Login to target registry
+    await $`echo ${process.env.JF_REGISTRY_PASSWORD_QA} | docker login --username ${process.env.JF_REGISTRY_USER_QA} --password-stdin ${JF_REGISTRY_URL}`;
+    await $`docker push ${TARGET_FULL_IMAGE_NAME}`;
 }

package/src/next/deploy.js

@@ -2,12 +2,10 @@ import fs from 'fs';
 import path from 'path';
 import yaml from 'js-yaml';
 import { $ } from 'zx';
-import lodash from 'lodash';
-import { appInfo, environmentConfig, getRepUrl } from './config.js';
-import { copy } from './copy.js';
-import axios from 'axios';
-import { runPipeline } from './pipline.js';
-import { deployCore } from './jenkins.js';
+
+const REPO_NAME = 'gitops-dev';
+const REPO_URL = `https://x-token-auth:${process.env.GITOPS_DEV_REP_TOKEN}@bitbucket.org/dp-cloud/${REPO_NAME}.git`;
+const GITOPS_BRANCH = 'master';
 
 /**
  * Clone the repository, read the YAML file, and return the parsed data and file paths.
@@ -15,87 +13,24 @@ import { deployCore } from './jenkins.js';
  * @param {string} site - The site name.
  * @returns {object} - The repository path, file path, and YAML data.
  */
+export async function readDeployConfig(application, site) {
+    const repoPath = path.join(process.cwd(), REPO_NAME);
+    const deployConfigFilePath = path.join(repoPath, `dp/${site}/${application}.values.yaml`);
 
-function getRepoLocalPath(env) {
-  const repoName = `gitops-${env}`;
-  const repoPath = path.join(process.cwd(), repoName);
-  return { repoPath, repoName };
-}
-
-function getRepoLocalPathByRepoSlug(repoSlug) {
-  const repoName = `${repoSlug}`;
-  const repoPath = path.join(process.cwd(), repoName);
-  return { repoPath, repoName };
-}
-
-function cleanUpRepoPath(repoPath) {
-  // Check and handle repo directory
-  if (fs.existsSync(repoPath)) {
-    console.log(`${repoPath} directory exists. Removing it...`);
-    fs.rmSync(repoPath, {
-      recursive: true,
-      force: true
-    });
-  }
-}
-
-export async function cloneEnvRepository(env) {
-  const { repoPath, repoName } = getRepoLocalPath(env);
-  const repoUrl = getRepUrl(repoName);
-  console.log(`Cloning repository: ${repoName}`);
-  await $`git clone --depth 1 ${repoUrl}`;
-  console.log(`Repository cloned to: ${repoPath}`);
-  return repoPath;
-}
-
-export async function cloneRepository(repoSlug) {
-  const { repoPath, repoName } = getRepoLocalPathByRepoSlug(repoSlug);
-  const repoUrl = getRepUrl(repoName);
-
-  await cleanUpRepoPath(repoPath)
-
-  console.log(`Cloning repository: ${repoName}`);
-  await $`git clone --depth 1 ${repoUrl}`;
-  console.log(`Repository cloned to: ${repoPath}`);
-  return repoPath;
-}
-
-function getConfigPath(application, env, site, name) {
-  const { repoPath } = getRepoLocalPath(env);
-  const deployConfigFilePath = path.join(
-    repoPath,
-    `dp/${site}/${application}.${name}.yaml`,
-  );
-
-  return { repoPath, deployConfigFilePath };
-}
-
-export async function readDeployConfig(application, env, site, name) {
-  const { deployConfigFilePath } = getConfigPath(application, env, site, name);
-
-  let deployConfig;
-  try {
-    deployConfig = yaml.load(fs.readFileSync(deployConfigFilePath, 'utf8'));
-    console.log(`YAML file loaded from: ${deployConfigFilePath}`);
-  } catch (error) {
-    console.error(`Error reading YAML file: ${error.message}`);
-    process.exit(1);
-  }
+    console.log(`Cloning repository: ${REPO_NAME}`);
+    await $`git clone ${REPO_URL}`;
+    console.log(`Repository cloned to: ${repoPath}`);
 
-  return { deployConfig, deployConfigFilePath };
-}
-
-export async function cloneAndReadDeployConfig(application, env, site) {
-  const repoPath = await cloneEnvRepository(env);
-
-  const { deployConfig, deployConfigFilePath } = await readDeployConfig(
-    application,
-    env,
-    site,
-    'values',
-  );
+    let deployConfig;
+    try {
+        deployConfig = yaml.load(fs.readFileSync(deployConfigFilePath, 'utf8'));
+        console.log(`YAML file loaded from: ${deployConfigFilePath}`);
+    } catch (error) {
+        console.error(`Error reading YAML file: ${error.message}`);
+        process.exit(1);
+    }
 
-  return { repoPath, deployConfigFilePath, deployConfig };
+    return { repoPath, deployConfigFilePath, deployConfig };
 }
 
 /**
@@ -105,15 +40,15 @@ export async function cloneAndReadDeployConfig(application, env, site) {
  * @returns {object} - The updated YAML data.
  */
 export function setTag(deployConfig, tag) {
-  if (deployConfig.image && deployConfig.image.tag) {
-    console.log(`Current image tag: ${deployConfig.image.tag}`);
-    deployConfig.image.tag = tag;
-    console.log(`Updated image tag to: ${deployConfig.image.tag}`);
-  } else {
-    console.error('No "image.tag" field found in the YAML file.');
-    process.exit(1);
-  }
-  return deployConfig;
+    if (deployConfig.image && deployConfig.image.tag) {
+        console.log(`Current image tag: ${deployConfig.image.tag}`);
+        deployConfig.image.tag = tag;
+        console.log(`Updated image tag to: ${deployConfig.image.tag}`);
+    } else {
+        console.error('No "image.tag" field found in the YAML file.');
+        process.exit(1);
+    }
+    return deployConfig;
 }
 
 /**
@@ -122,50 +57,25 @@ export function setTag(deployConfig, tag) {
  * @param {string} deployConfigFilePath - The path to the YAML file.
  * @param {object} deployConfig - The updated YAML data.
  */
+export async function writeDeployConfig(repoPath, deployConfigFilePath, deployConfig) {
+    try {
+        fs.writeFileSync(deployConfigFilePath, yaml.dump(deployConfig), 'utf8');
+        console.log(`Updated YAML file saved at: ${deployConfigFilePath}`);
+    } catch (error) {
+        console.error(`Error writing YAML file: ${error.message}`);
+        process.exit(1);
+    }
 
-export async function pushDeployConfig(repoPath, commitMessage) {
-  console.log('📌 Checking for updates to commit...');
-  // Check if there are any changes to commit
-  const status = (
-    await $`cd ${repoPath} && git status --porcelain`
-  ).stdout.trim();
-  if (!status) {
-    console.log('✅ No changes to commit. Exiting.');
-    await $`rm -rf ${repoPath}`;
-    console.log('🧹 Cleanup complete.');
-    return;
-  }
-
-  console.log('📌 Committing changes to the repository...');
-  await $`cd ${repoPath} && git config user.email "gitops@docupace.com"`;
-  await $`cd ${repoPath} && git add .`;
-  await $`cd ${repoPath} && git commit -m ${commitMessage}`;
-  await $`cd ${repoPath} && git push`;
-  console.log('✅ Changes pushed to the remote repository.');
-
-  console.log('🧹 Cleaning up...');
-  await $`rm -rf ${repoPath}`;
-  console.log('✅ Cleanup complete.');
-}
-
-function writeDeployConfig(deployConfigFilePath, deployConfig) {
-  try {
-    fs.writeFileSync(deployConfigFilePath, yaml.dump(deployConfig), 'utf8');
-    console.log(`✅ Updated YAML file saved at: ${deployConfigFilePath}`);
-  } catch (error) {
-    console.error(`❌ Error writing YAML file: ${error.message}`);
-    process.exit(1);
-  }
-}
+    console.log('Committing changes to the repository...');
+    await $`cd ${repoPath} && git config user.email "gitops@docupace.com"`;
+    await $`cd ${repoPath} && git add ${deployConfigFilePath}`;
+    await $`cd ${repoPath} && git commit -m "Update image tag to ${deployConfig.image.tag}"`;
+    await $`cd ${repoPath} && git push origin ${GITOPS_BRANCH}`;
+    console.log('Changes pushed to the remote repository.');
 
-export async function writeAndPushDeployConfig(
-  repoPath,
-  deployConfigFilePath,
-  deployConfig,
-  commitMessage,
-) {
-  writeDeployConfig(deployConfigFilePath, deployConfig);
-  await pushDeployConfig(repoPath, commitMessage);
+    console.log('Cleaning up...');
+    await $`rm -rf ${repoPath}`;
+    console.log('Cleanup complete.');
 }
 
 /**
@@ -175,181 +85,34 @@ export async function writeAndPushDeployConfig(
  */
 
 async function getDeployTag() {
-  const gitTag = (
-    await $`git tag --points-at HEAD | grep '^v' | head -n 1`
-  ).stdout.trim();
-  const deployTag = gitTag || `build-${process.env.BITBUCKET_BUILD_NUMBER}`;
-  return deployTag;
+    const gitTag = (await $`git tag --points-at HEAD | grep '^v' | head -n 1`).stdout.trim()
+    const deployTag = gitTag || `build-${process.env.BITBUCKET_BUILD_NUMBER}`;
+    return deployTag;
 }
 
 export async function deployTemplate(site) {
-  const deployTag = await getDeployTag();
-  console.log(`Deploying standard template for site: ${site}`);
-  console.log(`Using deployment tag: ${deployTag}`);
-  const { repoPath, deployConfigFilePath, deployConfig } =
-    await cloneAndReadDeployConfig('graphql-server', 'dev', site);
-
-  deployConfig.graphqlServer.standardConfigRemoteBranch = deployTag;
+    const deployTag = await getDeployTag();
+    console.log(`Deploying standard template for site: ${site}`);
+    console.log(`Using deployment tag: ${deployTag}`);
+    const { repoPath, deployConfigFilePath, deployConfig } = await readDeployConfig('graphql-server', site);
 
-  await writeAndPushDeployConfig(
-    repoPath,
-    deployConfigFilePath,
-    deployConfig,
-    `Update template to  ${deployConfig.graphqlServer.standardConfigRemoteBranch}`,
-  );
-  console.log('Deployment completed successfully.');
-}
-
-export async function deploy(application, site) {
-  const deployTag = getDeployTag();
+    deployConfig.graphqlServer.standardConfigRemoteBranch = deployTag;
 
-  console.log(`Deploying application: ${application} for site: ${site}`);
-  console.log(`Using deployment tag: ${deployTag}`);
+    await writeDeployConfig(repoPath, deployConfigFilePath, deployConfig);
+    console.log('Deployment completed successfully.');
 
-  const { repoPath, deployConfigFilePath, deployConfig } =
-    await cloneAndReadDeployConfig(application, 'dev', site);
-  const updatedConfigData = setTag(deployConfig, deployTag);
-  await writeAndPushDeployConfig(
-    repoPath,
-    deployConfigFilePath,
-    updatedConfigData,
-    `Update image tag to ${deployConfig.image.tag}`,
-  );
-
-  console.log('Deployment completed successfully.');
 }
 
-async function getAppInfo(coreUrl) {
-  const url = `${coreUrl}/b2b/rest/v1/appinfo`;
-  return await axios.get(url);
-}
-
-function getBranchNameFromVersion(version) {
-  const match = version.match(/(\d+\.\d+\.[^\-]+)(?:-(\d+)-g([a-f0-9]+))?/);
-
-  if (!match) {
-    throw new Error(`Invalid version format: ${version}`);
-  }
-
-  const fullVersion = match[1]; // e.g., 24.19.19, 24.20.alpha3, etc.
-  const customBranch = match[2]; // e.g., 4, 58, or 0
-  const commitHash = match[3]; // e.g., 668edef58e, 634cf6c904, etc.
-
-  // If "alpha" is in the version or customBranch is non-zero, use the commit hash
-  if (fullVersion.includes('alpha') || (customBranch && customBranch !== '0')) {
-    return commitHash;
-  }
-
-  // Otherwise, use the full version
-  return fullVersion;
-}
-
-async function getCoreBranchName(fromEnv, fromSite) {
-  const envConfig = environmentConfig[fromEnv];
-  const oldUrl = envConfig.oldUrl(fromSite);
-  const newUrl = envConfig.newUrl(fromSite) + '/core';
-
-  let appinfo;
-  try {
-    appinfo = await getAppInfo(oldUrl);
-  } catch {
-    try {
-      appinfo = await getAppInfo(newUrl);
-    } catch {
-      throw new Error('Cannot get app info');
-    }
-  }
-
-  const coreVersion = appinfo.data.core.version;
-  const branchName = getBranchNameFromVersion(coreVersion);
-  return branchName;
-}
 
-export async function deployFromSite(
-  fromEnv,
-  fromSite,
-  toEnv,
-  toSite,
-  isDeployCore,
-) {
-  if (isDeployCore === 'true') {
-    const branchName = await getCoreBranchName(fromEnv, fromSite);
-
-    const coreEnv = toEnv == 'qa' ? 'preprod' : toEnv;
-    await deployCore(coreEnv, toSite, 'true', branchName);
-
-    // To be added back when splitting between on prem and in cloud
-    /*await runPipeline('site-deploy', 'deploy-core', 'main', {
-      ENV: toEnv,
-      SITE: toSite,
-      LIQUIBASE: 'true',
-      BRANCH: branchName,
-    });*/
-  }
-
-  // Clone repositories for source and target environments
-  const fromRepoPath = await cloneEnvRepository(fromEnv);
-  const toRepoPath =
-    toEnv === fromEnv ? fromRepoPath : await cloneEnvRepository(toEnv);
-
-  // Initialize a flag to track changes
-  let changesMade = false;
-
-  // Iterate over applications in appInfo
-  for (const [application, appDetails] of Object.entries(appInfo)) {
-    console.log(`Processing application: ${application}`);
-
-    // Read the deployment configuration for the source environment and site
-    const { deployConfig: fromDeployConfig } = await readDeployConfig(
-      application,
-      fromEnv,
-      fromSite,
-      'values',
-    );
-
-    if (fromEnv !== toEnv) {
-      await copy(application, fromEnv, toEnv, fromDeployConfig.image.tag);
-    }
-
-    // Read the deployment configuration for the target environment and site
-    const {
-      deployConfig: toDeployConfig,
-      deployConfigFilePath: toDeployConfigFilePath,
-    } = await readDeployConfig(application, toEnv, toSite, 'values');
-
-    // Update target configuration using attributes specified in appInfo
-    for (const attribute of appDetails.deployAttributes) {
-      const sourceValue = lodash.get(fromDeployConfig, attribute);
-
-      if (sourceValue !== undefined) {
-        // Update the target configuration with the source value
-        lodash.set(toDeployConfig, attribute, sourceValue);
-        changesMade = true;
-      }
-    }
-
-    const {
-      deployConfig: toDeployAppConfig,
-      deployConfigFilePath: toDeployAppConfigFilePath,
-    } = await readDeployConfig(application, toEnv, toSite, 'app');
-
-    toDeployAppConfig.revision = fromDeployConfig.image.tag;
-
-    // Write updated configuration to the target YAML file
-    writeDeployConfig(toDeployConfigFilePath, toDeployConfig);
+export async function deploy(application, site) {
+    const deployTag = getDeployTag();
 
-    writeDeployConfig(toDeployAppConfigFilePath, toDeployAppConfig);
+    console.log(`Deploying application: ${application} for site: ${site}`);
+    console.log(`Using deployment tag: ${deployTag}`);
 
-  }
+    const { repoPath, deployConfigFilePath, deployConfig } = await readDeployConfig(application, site);
+    const updatedConfigData = setTag(deployConfig, deployTag);
+    await writeDeployConfig(repoPath, deployConfigFilePath, updatedConfigData);
 
-  // Push all changes if any updates were made
-  if (changesMade) {
-    await pushDeployConfig(
-      toRepoPath,
-      `Updated deployment configurations from ${fromEnv}/${fromSite} to ${toEnv}/${toSite}`,
-    );
-    console.log('✅ All configurations updated and pushed successfully.');
-  } else {
-    console.log('✅ No changes detected. Nothing to push.');
-  }
+    console.log('Deployment completed successfully.');
 }