@docupace/pipeline 1.0.39-newrelease.13 → 1.0.39-newrelease.14

package/src/changeset/changeset-config.js

@@ -0,0 +1,34 @@
+import fs from 'fs';
+import path from 'path';
+
+// Get absolute path to .changeset/config.json using current working directory
+const configPath = path.join(process.cwd(), '.changeset', 'config.json');
+
+// Function to update baseBranch to BITBUCKET_BRANCH
+export function updateBaseBranch() {
+  const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  if (!process.env.BITBUCKET_BRANCH) {
+    return null;
+  }
+  let originalbaseBranch = config.baseBranch;
+  config.baseBranch = process.env.BITBUCKET_BRANCH;
+
+  if (!config.baseBranch) {
+    throw new Error('BITBUCKET_BRANCH environment variable is not set.');
+  }
+
+  fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+  console.log(`baseBranch updated to ${process.env.BITBUCKET_BRANCH}`);
+
+  return originalbaseBranch;
+}
+
+// Function to revert baseBranch to original value
+export function revertBaseBranch(originalBaseBranch) {
+  if (!originalBaseBranch) return;
+
+  const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  config.baseBranch = originalBaseBranch;
+  fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+  console.log(`baseBranch reverted to ${originalBaseBranch}`);
+}

package/src/changeset/cli.js

@@ -7,7 +7,11 @@ import { $ } from 'zx';
 import { validateChangesets } from './validate.js';
 
 import { isMonoRepo, setGitInfo } from '../next/util.js';
-import { updateJiraWithVersion, versionCommand } from './version.js';
+import {
+  toShortVersion,
+  updateJiraWithVersion,
+  versionCommand,
+} from './version.js';
 import { createChangeset } from './create.js';
 
 const program = new Command();
@@ -36,8 +40,9 @@ async function commitTagCommand(releases) {
 }
 
 export function getAppReleases(releases) {
-  const appReleases = releases.filter((release) =>
-    release.name.endsWith('-app'),
+  const appReleases = releases.filter(
+    (release) =>
+      release.name.endsWith('-app') || release.name.endsWith('-template'),
   );
   return appReleases;
 }
@@ -58,17 +63,30 @@ async function commitTagMono(releases) {
     versions.push(`${appName}@${newVersion}`);
   }
 
-  const { stdout } = await $`git symbolic-ref refs/remotes/origin/HEAD`;
-  const defaultBranch = stdout.trim().replace('refs/remotes/origin/', '');
+  const defaultBranch = process.env.BITBUCKET_BRANCH;
+
+  if (!process.env.IS_DEV) {
+    await $`git commit -m "Version bump to ${versions.join(',')} and changelog"`;
+    await $`git push origin ${defaultBranch}`;
+  } else {
+    console.log(`Simulate Version bump to ${versions.join(',')} and changelog`);
+  }
 
-  await $`git commit -m "Version bump to ${versions.join(',')} and changelog"`;
-  await $`git push origin ${defaultBranch}`;
   for (const newVersion of versions) {
-    await $`git tag ${newVersion}`;
-    console.log(`✅ Version ${newVersion} tagged.`);
+    if (!process.env.IS_DEV) {
+      await $`git tag ${newVersion}`;
+      console.log(`✅ Version ${newVersion} tagged.`);
+    } else {
+      console.log(`✅ Simulate Version ${newVersion} tagged.`);
+    }
+  }
+
+  if (!process.env.IS_DEV) {
+    await $`git push origin --tags`;
+    console.log(`✅ Version pushed.`);
+  } else {
+    console.log(`✅ Simulate Version pushed.`);
   }
-  await $`git push origin --tags`;
-  console.log(`✅ Version pushed.`);
 }
 
 async function commitTag() {
@@ -76,8 +94,7 @@ async function commitTag() {
     await $`node -p "require('./package.json').version"`
   ).stdout.trim();
 
-  const { stdout } = await $`git symbolic-ref refs/remotes/origin/HEAD`;
-  const defaultBranch = stdout.trim().replace('refs/remotes/origin/', '');
+  const defaultBranch = process.env.BITBUCKET_BRANCH;
 
   await $`git commit -m "Version bump to ${newVersion} and changelog"`;
   await $`git push origin ${defaultBranch}`;
@@ -147,12 +164,20 @@ program
     if (isMonoRepo()) {
       for (const release of getAppReleases(releases)) {
         const appName = getAppNameFromPackageName(release.name);
-        await $`git checkout -b release/${appName}/${release.newVersion}`;
-        await $`git push origin release/${appName}/${release.newVersion}`;
+        const newVersion = toShortVersion(release.newVersion);
+        if (!newVersion) {
+          throw new Error('Error calculating branch name');
+        }
+        await $`git checkout -b release/${appName}/${newVersion}`;
+        await $`git push origin release/${appName}/${newVersion}`;
       }
     } else {
-      await $`git checkout -b release/${releases[0].newVersion}`;
-      await $`git push origin release/${releases[0].newVersion}`;
+      const newVersion = toShortVersion(releases[0].newVersion);
+      if (!newVersion) {
+        throw new Error('Error calculating branch name');
+      }
+      await $`git checkout -b release/${newVersion}`;
+      await $`git push origin release/${newVersion}`;
     }
 
     // Return to original branch

package/src/changeset/version.js

@@ -3,6 +3,8 @@ import { $ } from 'zx';
 import fs from 'fs';
 import { updateComponentVersion } from '../next/jira.js';
 import { findJiraTicketId } from './util.js';
+import { revertBaseBranch, updateBaseBranch } from './changeset-config.js';
+import semver from 'semver';
 
 const changeSetPackage = `{
   "name": "changeset-package",
@@ -33,6 +35,12 @@ async function removeChangesetOutput() {
   await fs.promises.rm(outputPath);
 }
 
+export function toShortVersion(version) {
+  const parsed = semver.parse(version);
+  if (!parsed) return null;
+  return `${parsed.major}.${parsed.minor}`;
+}
+
 export async function versionStatus(sinceBranch) {
   const outputPath = './changeset-output.json';
 
@@ -50,27 +58,32 @@ export async function versionStatus(sinceBranch) {
 
 export async function versionCommand(closeVersion = false) {
   console.log('📦 Running Changeset versioning...');
-  await setGitInfo();
-  await $`mv package.json package.json.bak`;
-  await $`mv pnpm-lock.yaml pnpm-lock.yaml.bak`;
-  await fs.promises.writeFile('package.json', changeSetPackage);
-  await $`pnpm install`;
-  await $`rm package.json pnpm-lock.yaml`;
-  await $`mv package.json.bak package.json`;
-  await $`mv pnpm-lock.yaml.bak pnpm-lock.yaml`;
+  if (!process.env.IS_DEV) {
+    await setGitInfo();
+    await $`mv package.json package.json.bak`;
+    await $`mv pnpm-lock.yaml pnpm-lock.yaml.bak`;
+    await fs.promises.writeFile('package.json', changeSetPackage);
+    await $`pnpm install`;
+    await $`rm package.json pnpm-lock.yaml`;
+    await $`mv package.json.bak package.json`;
+    await $`mv pnpm-lock.yaml.bak pnpm-lock.yaml`;
+  }
   if (closeVersion) {
     await $`pnpm changeset pre exit`;
   }
 
+  let originalBaseBranch;
   try {
+    originalBaseBranch = updateBaseBranch();
     const releases = await versionStatus();
-
+    revertBaseBranch(originalBaseBranch);
     await $`pnpm changeset version`;
 
     await removeChangesetOutput();
 
     return releases;
   } catch {
+    revertBaseBranch(originalBaseBranch);
     return [];
   }
 }

package/src/next/apache.js

@@ -1,11 +1,16 @@
+import fs from 'fs-extra';
 import { $ } from 'zx';
 
+function log(msg) {
+  console.log(`[*] ${msg}`);
+}
+
 export async function addApacheSite() {
   if (
     !process.env.ENVIRONMENT ||
-    (process.env.ENVIRONMENT !== 'dev' && process.env.ENVIRONMENT !== 'qa')
+    !['dev', 'qa', 'uat', 'stage','www3'].includes(process.env.ENVIRONMENT)
   ) {
-    log("Error: ENVIRONMENT must be either 'dev' or 'qa'.");
+    log('Error: wront ENVIRONMENT');
     process.exit(1);
   }
   if (!process.env.SITE) {
@@ -13,6 +18,34 @@ export async function addApacheSite() {
     process.exit(1);
   }
 
+  const apacheEnvHostMap = {
+    dev: {
+      host1: 'dev-apalb01a.corp.docupace.com',
+      host2: 'dev-apalb01b.corp.docupace.com',
+      repo: 'iis-preprod',
+    },
+    qa: {
+      host1: 'qa-apalb01a.corp.docupace.com',
+      host2: 'qa-apalb01b.corp.docupace.com',
+      repo: 'iis-preprod',
+    },
+    uat: {
+      host1: 'uat-apalb01a.edc.docupace.internal',
+      host2: 'uat-apalb01b.edc.docupace.internal',
+      repo: 'iis-www2',
+    },
+    stage: {
+      host1: 'stg-apalb01a.edc.docupace.internal',
+      host2: 'stg-apalb01b.edc.docupace.internal',
+      repo: 'iis-www2',
+    },
+    www3: {
+      host1: 'prd-apalb05a.edc.docupace.internal',
+      host2: 'prd-apalb05b.edc.docupace.internal',
+      repo: 'iis-www2',
+    },
+  };
+
   // Save private key from base64
   const haproxyPrivateKey = process.env.HAPROXY_PRIVATE_KEY;
   if (!haproxyPrivateKey) {
@@ -27,17 +60,22 @@ export async function addApacheSite() {
   const sshCmd = (server, script) =>
     $`ssh -i private.key -o StrictHostKeyChecking=no root@${server} ${script}`;
 
-  let server = `${process.env.ENVIRONMENT}-apalb01a.corp.docupace.com`;
   // The script is run twice in the Bash version
   await sshCmd(
-    server,
-    `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
+    apacheEnvHostMap[process.env.ENVIRONMENT].host1,
+    `/root/tomcat_repo_sync.sh`,
+  );
+  await sshCmd(
+    apacheEnvHostMap[process.env.ENVIRONMENT].host1,
+    `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
+  );
+  
+  await sshCmd(
+    apacheEnvHostMap[process.env.ENVIRONMENT].host2,
+    `/root/tomcat_repo_sync.sh`,
   );
-
-  server = `${process.env.ENVIRONMENT}-apalb01b.corp.docupace.com`;
-
   await sshCmd(
-    server,
-    `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
+    apacheEnvHostMap[process.env.ENVIRONMENT].host2,
+    `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
   );
 }

package/src/next/cli.js

@@ -105,40 +105,46 @@ program
   });
 
 program
-  .command('deploy-template')
-  .description('Deploy an application for a specific site')
-  .action(async () => {
-    const deployTag = await getDeployTag();
-    const { env, site } = await getDefaultDeploySite(deployTag);
-    await deployTemplate(env, site, deployTag);
+  .command('deploy-template [tagPrefix]')
+  .description('Deploy an standard configuration for configured sites')
+  .action(async (tagPrefix) => {
+    const deployTag = await getDeployTag(tagPrefix);
+    const sites = await getDefaultDeploySite(deployTag);
+    for (const { env, site } of sites) {
+      await deployTemplate(env, site, deployTag);
+    }
   });
 
 program
-  .command('deployTemplate')
-  .description('Deploy an application for a specific site')
-  .action(async () => {
-    const deployTag = await getDeployTag();
-    const { env, site } = await getDefaultDeploySite(deployTag);
-    await deployTemplate(env, site, deployTag);
+  .command('deploy-site-config <env> <site> [tagPrefix]')
+  .description('Deploy site configuration for a specific site')
+  .action(async (env, site, tagPrefix) => {
+    const deployTag = await getDeployTag(tagPrefix);
+    await deployTemplate(env, site, deployTag, 'siteConfigRemoteBranch');
   });
 
+
 program
   .command('deploy-app <application>')
   .description('Deploy an application for a specific site')
   .action(async (application) => {
     const deployTag = await getDeployTag();
-    const { env, site } = await getDefaultDeploySite(deployTag);
-    await deployAppWithTag(application, env, site, deployTag);
+    const sites = await getDefaultDeploySite(deployTag);
+    for (const { env, site } of sites) {
+      await deployAppWithTag(application, env, site, deployTag);
+    }
   });
 
 program
   .command('deploy-mono-app <tag> <application>')
-  .description('Deploy an application for a specific site')
+  .description('Deploy an mono application for a specific site')
   .action(async (tag, application) => {
     const deployTag = await getDeployTag(tag);
     const version = 'v' + deployTag.split('@')[1];
-    const { env, site } = await getDefaultDeploySite(version);
-    await deployAppWithTag(application, env, site, version);
+    const sites = await getDefaultDeploySite(version);
+    for (const { env, site } of sites) {
+      await deployAppWithTag(application, env, site, version);
+    }
   });
 
 program

package/src/next/config.js

@@ -19,20 +19,20 @@ export const environmentConfig = {
   },
   uat: {
     newUrl: (site) => `https://${site}.uat.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}_uat`,
-    docupaceHost: () => 'www2.paperout.com',
+    oldUrl: (site) => `https://uat.paperout.com/${site}`,
+    docupaceHost: () => 'uat.paperout.com',
     ccUrl: (site) => `https://${site}-cc.uat.dpai.tech`,
   },
   stage: {
-    newUrl: (site) => `https://${site}.stg.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}_staging`,
-    docupaceHost: () => 'www2.paperout.com',
-    ccUrl: (site) => `https://${site}-cc.stg.dpai.tech`,
+    newUrl: (site) => `https://${site}.stage.dpai.tech`,
+    oldUrl: (site) => `https://stage.paperout.com/${site}`,
+    docupaceHost: () => 'stage.paperout.com',
+    ccUrl: (site) => `https://${site}-cc.stage.dpai.tech`,
   },
   prod: {
     newUrl: (site) => `https://${site}.dpai.tech`,
-    oldUrl: (site) => `https://www2.paperout.com/${site}`,
-    docupaceHost: () => 'www2.paperout.com',
+    oldUrl: (site) => `https://www3.paperout.com/${site}`,
+    docupaceHost: () => 'www3.paperout.com',
     ccUrl: (site) => `https://${site}-cc.dpai.tech`,
   },
 };
@@ -130,6 +130,8 @@ export const coreSiteEnvMap = {
   dev: 'dev',
   qa: 'preprod',
   stg: 'staging',
+  stage: 'staging',
   uat: 'uat',
   prd: 'prod',
+  prod: 'prod',
 };

package/src/next/connect.js

@@ -2,7 +2,7 @@ import 'zx/globals'; // npm i zx
 import fs from 'fs-extra';
 import path from 'path';
 import { $ } from 'zx';
-
+import { getAuth0Metadata } from '../auth0/metadata.js';
 import { getVaultSecrets } from '../auth0/vault.js';
 
 process.env.COMMON_VAULT_PATH =
@@ -15,9 +15,42 @@ const vaultAddr = process.env.VAULT_ADDR;
 const connectUIEnvMap = {
   dev: 'dev',
   qa: 'preprod',
-  stg: 'stg',
+  stage: 'stg',
+  uat: 'uat',
+  prod: 'prod-www3',
+};
+
+
+const siteSettingsEnvMap = {
+  dev: 'dev',
+  preprod: 'preprod',
+  qa: 'preprod',
+  stage: 'staging',
+  stg: 'staging',
+  uat: 'uat',
+  prd: 'prod',
+  prod: 'prod',
+  'prod-www3': 'prod',
+  'prod-las': 'prod',
+  'prod-lax': 'prod',
+  'prod-athene': 'prod',
+  'prod-staging': 'prod',
+};
+
+const idpEnvMap = {
+  dev: 'dev',
+  preprod: 'qa',
+  qa: 'qa',
+  stage: 'stage',
+  stg: 'stage',
   uat: 'uat',
-  prd: 'prod-las',
+  prd: 'prod',
+  prod: 'prod',
+  'prod-www3': 'prod',
+  'prod-las': 'prod',
+  'prod-lax': 'prod',
+  'prod-athene': 'prod',
+  'prod-staging': 'prod',
 };
 
 function log(msg) {
@@ -47,8 +80,10 @@ async function gitCheckout(repository, destDir, branch = 'master') {
 }
 
 export async function connectClone() {
-  const connectFromEnv = connectUIEnvMap[process.env.FROM_BUILD_ENVIRONMENT];
-  const connectToEnv = connectUIEnvMap[process.env.BUILD_ENVIRONMENT];
+  // const connectFromEnv = connectUIEnvMap[process.env.FROM_BUILD_ENVIRONMENT];
+  const connectFromEnv = process.env.FROM_BUILD_ENVIRONMENT;
+  const connectToEnv = process.env.BUILD_ENVIRONMENT;
+
   if (!vaultToken || !vaultAddr) {
     console.error('Error: VAULT_TOKEN and VAULT_ADDR must be set.');
     throw new Error('VAULT_TOKEN and VAULT_ADDR must be set.');
@@ -81,7 +116,7 @@ export async function connectClone() {
   log(`AUTH0_REGION_DOMAIN: ${process.env.AUTH0_REGION_DOMAIN}`);
   log(`AUTH0_CLIENT_ID: ${process.env.AUTH0_CLIENT_ID}`);
 
-  process.env.AUTH0_DOMAIN = `docupace-${process.env.BUILD_ENVIRONMENT}-${process.env.BUILD_SITE}.${process.env.AUTH0_REGION_DOMAIN}`;
+  process.env.AUTH0_DOMAIN = `docupace-${idpEnvMap[process.env.BUILD_ENVIRONMENT]}-${process.env.BUILD_SITE}.${process.env.AUTH0_REGION_DOMAIN}`;
 
   const projectRoot = process.cwd();
   // 4) Clone 'connect-deploy' into CONNECT_DIR
@@ -89,8 +124,8 @@ export async function connectClone() {
   await gitCheckout('connect-deploy', process.env.CONNECT_DIR);
 
   await gitCheckout(
-    `${connectToEnv}-site-settings`,
-    `${process.env.CONNECT_DIR}/${connectToEnv}-site-settings`,
+    `${siteSettingsEnvMap[connectToEnv]}-site-settings`,
+    `${process.env.CONNECT_DIR}/${siteSettingsEnvMap[connectToEnv]}-site-settings`,
   );
 
   // 5) Create site clone (emulating the dock.sh call)
@@ -123,7 +158,7 @@ export async function connectClone() {
       try {
         // Execute the shell command
         const result =
-          await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
+        await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
         await $`cd ${cloneTo} && git checkout master && git pull --ff-only`;
         await $`cd ${cloneTo} && git remote -v`;
         await $`cd ${cloneTo} && git branch`;
@@ -145,31 +180,33 @@ export async function connectClone() {
     log('Site already exists. Continuing Auth0 setup...');
   }
 
-  await (async () => {
-    try {
-      // Execute the shell command
-      const result = await $`cd ${cloneTo} && bash dock.sh getAuth0Metadata`;
-      console.log('Command succeeded:');
-      console.log('stdout:', result.stdout); // Standard output
-      console.log('stderr:', result.stderr); // Standard error
-    } catch (error) {
-      console.error('Command failed:');
-      console.error('Exit Code:', error._code); // Exit code of the command
-      console.error('Signal:', error._signal); // Signal that caused termination (if any)
-      console.error('stdout:', error._stdout); // Standard output
-      console.error('stderr:', error._stderr); // Standard error
-    }
-  })();
+  // await (async () => {
+  //   try {
+  //     // Execute the shell command
+  //     //await getAuth0Metadata(process.env.BUILD_SITE, connectToEnv);
+  //     const result = await $`cd ${cloneTo} && bash dock.sh getAuth0Metadata`;
+  //     console.log('Command succeeded:');
+  //     console.log('stdout:', result.stdout); // Standard output
+  //     console.log('stderr:', result.stderr); // Standard error
+  //   } catch (error) {
+  //     console.error('Command failed:');
+  //     console.error('Exit Code:', error._code); // Exit code of the command
+  //     console.error('Signal:', error._signal); // Signal that caused termination (if any)
+  //     console.error('stdout:', error._stdout); // Standard output
+  //     console.error('stderr:', error._stderr); // Standard error
+  //   }
+  // })();
 
   // 7) Check conf files, print logs
-  await $`grep "auth0" ${path.join(cloneTo, 'conf/application.conf')}`;
-  await $`ls -all ${path.join(cloneTo, 'conf')}`;
-  await $`ls -all ${path.join(cloneTo, 'conf/saml')}`;
-  await $`cat ${path.join(cloneTo, 'conf/saml/auth0.xml')}`;
+  // await $`grep "auth0" ${path.join(cloneTo, 'conf/application.conf')}`;
+  // await $`ls -all ${path.join(cloneTo, 'conf')}`;
+  // await $`ls -all ${path.join(cloneTo, 'conf/saml')}`;
+  // await $`cat ${path.join(cloneTo, 'conf/saml/auth0.xml')}`;
 
   // 8) Git add, commit, push
-  await $`cd ${cloneTo} && git add ./conf/application.conf ./conf/saml/auth0.xml`;
-  await $`cd ${cloneTo} && git status`;
+  // await $`cd ${cloneTo} && git add ./conf/application.conf ./conf/saml/auth0.xml`;
+  //await $`cd ${cloneTo} && git add ./conf/application.conf`;
+  //await $`cd ${cloneTo} && git status`;
 
   const numChanges = (await $`cd ${cloneTo} && git diff-index HEAD`).stdout
     .split('\n')
@@ -181,6 +218,7 @@ export async function connectClone() {
     log('About to commit changes to git');
     await $`cd ${cloneTo} && git commit -m ${message}`;
     await $`cd ${cloneTo} && git push -u origin master`;
+    //await getAuth0Metadata(process.env.BUILD_SITE, connectToEnv);
   } else {
     log(
       'No changes have been made. The site likely already has the correct configuration.',

package/src/next/deploy.js

@@ -274,19 +274,54 @@ export async function getDeployTag(prefix = 'v') {
   return deployTag;
 }
 
+function getDeploymentTargets(tag, config) {
+  const semverRegex = /^v?(\d+)\.(\d+)\.(\d+)(?:-([\w.\-]+))?$/;
+  const match = tag.match(semverRegex);
+
+  if (!match) {
+    throw new Error(`Invalid tag format: ${tag}`);
+  }
+
+  const [_, major, minor, patch, preRelease] = match;
+  const isAlpha = preRelease && preRelease.toLowerCase().includes('alpha');
+
+  return config
+    .filter((entry) => {
+      if (entry.version.toLowerCase() === 'alpha' && isAlpha) {
+        return true;
+      }
+
+      const [entryMajor, entryMinor] = entry.version.split('.');
+      return (
+        !isAlpha &&
+        parseInt(entryMajor) === parseInt(major) &&
+        parseInt(entryMinor) === parseInt(minor)
+      );
+    })
+    .map((entry) => ({ env: entry.env, site: entry.site }));
+}
+
 export async function getDefaultDeploySite(deployTag) {
-  const env = deployTag.includes('alpha') ? 'dev' : 'qa';
-  const site = env === 'dev' ? 'financialdev' : 'qa';
-  return { env, site };
+  const repPath = await cloneEnvRepository('dev');
+  const autoDeployConfigPath = path.resolve(repPath, 'auto-deploy.yaml');
+  const autoDeployConfig = yaml.load(
+    fs.readFileSync(autoDeployConfigPath, 'utf8'),
+  );
+  return getDeploymentTargets(deployTag, autoDeployConfig);
 }
 
-export async function deployTemplate(env, site, deployTag) {
+export async function deployTemplate(
+  env,
+  site,
+  deployTag,
+  templateType = 'standardConfigRemoteBranch',
+) {
   console.log(`Deploying standard template for site: ${site}`);
   console.log(`Using deployment tag: ${deployTag}`);
   const { repoPath, deployConfigFilePath, deployConfig } =
     await cloneAndReadDeployConfig('graphql-server', env, site);
 
-  deployConfig.graphqlServer.standardConfigRemoteBranch = deployTag;
+  deployConfig.graphqlServer[templateType] = deployTag;
 
   await writeAndPushDeployConfig(
     repoPath,
@@ -300,9 +335,9 @@ export async function deployTemplate(env, site, deployTag) {
 export async function deployAppWithTag(application, env, site, deployTag) {
   console.log(`Deploying application: ${application} for site: ${site}`);
   console.log(`Using deployment tag: ${deployTag}`);
+  const appDetails = appInfo[application];
 
   if (env !== 'dev') {
-    const appDetails = appInfo[application];
     await copy2(
       appDetails.repositoryName,
       'dev',
@@ -315,6 +350,18 @@ export async function deployAppWithTag(application, env, site, deployTag) {
   const { repoPath, deployConfigFilePath, deployConfig } =
     await cloneAndReadDeployConfig(application, env, site);
   const updatedConfigData = setTag(deployConfig, deployTag);
+
+  const {
+    deployConfig: toDeployAppConfig,
+    deployConfigFilePath: toDeployAppConfigFilePath,
+  } = await readDeployConfig(application, env, site, 'app');
+
+  toDeployAppConfig.revision = appDetails.getAppRevision
+    ? appDetails.getAppRevision(updatedConfigData)
+    : updatedConfigData.image.tag;
+
+  writeDeployConfig(toDeployAppConfigFilePath, toDeployAppConfig);
+
   await writeAndPushDeployConfig(
     repoPath,
     deployConfigFilePath,