@docupace/pipeline 1.0.39-newrelease.19 → 1.0.39-newrelease.4

package/eslint.config.js

@@ -10,7 +10,7 @@ export default [
       globals: {
         ...globals.browser,
         ...globals.node, // Add Node.js globals
-      },g
+      },
     },
   },
   pluginJs.configs.recommended,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.39-newrelease.19",
+  "version": "1.0.39-newrelease.4",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -20,6 +20,7 @@
   "dependencies": {
     "@changesets/cli": "^2.27.10",
     "@docupace/core-client": "^0.1.59",
+    "@docupace/pipeline": "^1.0.33-alpha-2",
     "auth0-deploy-cli": "^8.8.0",
     "axios": "^1.7.9",
     "commander": "^12.1.0",

package/src/auth0/cli.js

@@ -15,7 +15,7 @@ const program = new Command();
 
 program
   .command(
-    'configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain> <useS3Ui> <deployCCUI> <useS3Gq> ',
+    'configureFromSite <fromSite> <toSite> <fromEnv> <toEnv> <deployUI> <deployGraphQLServer> <useNewDomain> <useS3>',
   )
   .description('Configure the Auth0 tenants in env for the given site')
   .action(
@@ -27,9 +27,7 @@ program
       deployUI,
       deployGraphQLServer,
       useNewDomain,
-      useS3Ui,
-      deployCCUI,
-      useS3Gq,
+      useS3,
     ) => {
       await configureFromSite(
         fromSite,
@@ -39,9 +37,7 @@ program
         deployUI,
         deployGraphQLServer,
         useNewDomain,
-        useS3Ui === 'true' || useS3Ui === true,
-        deployCCUI,
-        useS3Gq === 'true' || useS3Gq === true,
+        useS3 === 'true' || useS3 === true,
       );
     },
   );

package/src/auth0/configure.js

@@ -10,10 +10,7 @@ import {
   readDeployConfig,
 } from '../next/deploy.js';
 
-import {
-  getVaultSecrets,
-  updateVaultSecrets
-} from './vault.js';
+import { getVaultSecrets, updateVaultSecrets } from './vault.js';
 import {
   coreSiteEnvMap,
   environmentConfig,
@@ -22,7 +19,7 @@ import {
 
 async function ensureDirectoryExists(dirPath) {
   try {
-    await fs.promises.mkdir(dirPath, {recursive: true});
+    await fs.promises.mkdir(dirPath, { recursive: true });
     console.log(`Directory created or already exists: ${dirPath}`);
   } catch (err) {
     console.error(`Failed to create directory: ${err.message}`);
@@ -60,7 +57,6 @@ export async function getAuth0AuthToken(auth0Domain, clientId, clientSecret) {
 async function configureUI(
   siteHost,
   coreURL,
-  connectURL,
   docupaceHost,
   site,
   env,
@@ -70,7 +66,6 @@ async function configureUI(
   auth0Token,
   vaultSiteSecretsPath,
   imageTag,
-  revision,
   repoPath,
   useS3,
 ) {
@@ -79,13 +74,12 @@ async function configureUI(
   );
   siteHost = siteHost.replace('https://', '');
   coreURL = coreURL.replace('https://', '');
-  connectURL = connectURL.replace('https://', '');
 
   try {
     const auth0Response = await axios.get(
       `https://${auth0Domain}/api/v2/clients`,
       {
-        headers: {authorization: `Bearer ${auth0Token}`},
+        headers: { authorization: `Bearer ${auth0Token}` },
       },
     );
 
@@ -121,18 +115,10 @@ async function configureUI(
       console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
     }
 
-    const awsS3Vars = (useS3 === true || useS3 === 'true')
-      ? `
-    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
-    AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
-    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
-    AWS_REGION: vault:secret/data/${site}/aws/config#AWS_REGION`
-      : '';
-
     // Prepare ui.app.yaml
     const uiAppYaml = `
 repo: docupace-ui-main
-revision: ${revision}
+revision: master
 `.trim();
 
     // Prepare ui.values.yaml
@@ -143,21 +129,33 @@ uiMain:
   auth0ClientId: vault:secret/data/${site}/ui/config#AUTH0_CLIENT_ID
   graphqlClientUrl: https://${siteHost}/api/graphql
   graphqlServerUrl: https://${siteHost}/api/graphql
-  connectUrl: https://${connectURL}
+  connectUrl: https://${siteHost}
   coreUrl: https://${coreURL}
   env:
     AUTH0_CLIENT_SECRET: vault:secret/data/${site}/ui/config#AUTH0_CLIENT_SECRET
-    AUTH0_SECRET: vault:secret/data/${site}/ui/config#AUTH0_SECRET${awsS3Vars ? '\n    ' + awsS3Vars.trim() : ''}
+    AUTH0_SECRET: vault:secret/data/${site}/ui/config#AUTH0_SECRET
+    ${
+      useS3 === true || useS3 === 'true'
+        ? `
+    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
+    AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
+    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
+    `.trim()
+        : ''
+    }
 image:
-  repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/enterprise-ui-app
+  repository: registry.paperout.com/docupace-ui-main-dev-docker-local/docupace-ui-main
   tag: ${imageTag}
-${useS3 === true || useS3 === 'true' ? `
+${
+  useS3 === true || useS3 === 'true'
+    ? `
 serviceAccount:
   create: true
   annotations:
-    "helm.sh/hook": pre-install
-    "helm.sh/hook-weight": "-10"
-    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket` : ''}
+    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket
+`.trim()
+    : ''
+}
 imagePullSecrets:
   - name: jf-artifactory
 ingress:
@@ -222,7 +220,7 @@ externalConnectService:
         if (err) {
           console.error('Failed to write the file:', err);
         } else {
-          console.log(`File ${repoPath}/dp/${site}/ui.app.yaml written successfully.`);
+          console.log('File written successfully.');
         }
       },
     );
@@ -234,167 +232,18 @@ externalConnectService:
         if (err) {
           console.error('Failed to write the file:', err);
         } else {
-          console.log(`File ${repoPath}/dp/${site}/ui.values.yaml written successfully.`);
+          console.log('File written successfully.');
         }
       },
     );
-    console.log('The UI part is done!');
+    console.log('Done!');
+    console.log('Updating Core Site Config...');
+    await updateCoreSiteConfig(site, env, useS3);
   } catch (error) {
     console.error('Error configuring UI:', error);
   }
 }
 
-async function configureCCUI(
-  siteHost,
-  coreURL,
-  connectURL,
-  docupaceHost,
-  site,
-  env,
-  auth0Domain,
-  auth0ClientId,
-  auth0ClientSecret,
-  auth0Token,
-  vaultSiteSecretsPath,
-  imageTag,
-  revision,
-  repoPath,
-  useS3,
-  ccUrl,
-) {
-  console.log(
-    `Configuring CC UI for site: ${site} Host: ${siteHost} in env: ${env}`,
-  );
-  siteHost = siteHost.replace('https://', '');
-  coreURL = coreURL.replace('https://', '');
-  connectURL = connectURL.replace('https://', '');
-  ccUrl = ccUrl.replace('https://', '');
-
-  try {
-    const auth0Response = await axios.get(
-      `https://${auth0Domain}/api/v2/clients`,
-      {
-        headers: {authorization: `Bearer ${auth0Token}`},
-      },
-    );
-
-    const uiClient = auth0Response.data.find(
-      (client) => client.name === 'docupace-ui-cc',
-    );
-    const uiAuth0ClientId = uiClient.client_id;
-    const uiAuth0ClientSecret = uiClient.client_secret;
-
-    // Generate Auth0 Secret
-    const uiAuth0Secret = crypto
-      .randomBytes(48)
-      .toString('base64')
-      .replace(/[^a-zA-Z0-9]/g, '');
-
-    // Prepare data payload
-    console.log('Preparing Vault CC UI data payload...');
-    const ccUISecretData = JSON.stringify({
-      data: {
-        AUTH0_CLIENT_ID: uiAuth0ClientId,
-        AUTH0_CLIENT_SECRET: uiAuth0ClientSecret,
-        AUTH0_SECRET: uiAuth0Secret,
-      },
-    });
-    console.log('Updating Vault Site Secret =>', vaultSiteSecretsPath);
-    await updateVaultSecrets(vaultSiteSecretsPath, ccUISecretData);
-
-    let siteAWSSecrets = null;
-
-    if (useS3 === true || useS3 === 'true') {
-      const siteAWSSecretsPath = getVaultSecretsConfigs(site).awsSecretsPath;
-      siteAWSSecrets = await getVaultSecrets(siteAWSSecretsPath);
-      console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
-    }
-
-    const awsS3Vars = (useS3 === true || useS3 === 'true')
-      ? `
-    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
-    AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
-    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
-    AWS_REGION: vault:secret/data/${site}/aws/config#AWS_REGION`
-      : '';
-
-    // Prepare cc.app.yaml
-    const uiCCValuesYaml = `
-uiMain:
-  auth0BaseUrl: https://${ccUrl}
-  auth0IssuerBaseUrl: https://${auth0Domain}
-  auth0ClientId: vault:secret/data/${site}/ui-cc/config#AUTH0_CLIENT_ID
-  graphqlClientUrl: https://${siteHost}/api/graphql
-  graphqlServerUrl: https://${siteHost}/api/graphql
-  connectUrl: https://${connectURL}
-  coreUrl: https://${coreURL}
-  env:
-    AUTH0_AUDIENCE: core-api-access
-    AUTH0_CLIENT_SECRET: vault:secret/data/${site}/ui-cc/config#AUTH0_CLIENT_SECRET
-    AUTH0_SECRET: vault:secret/data/${site}/ui-cc/config#AUTH0_SECRET${awsS3Vars ? '\n    ' + awsS3Vars.trim() : ''}
-image:
-  repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/cc-ui-app
-  tag: ${imageTag}
-imagePullSecrets:
-  - name: jf-artifactory
-ingress:
-  enabled: true
-  className: nginx
-  annotations:
-    external-dns.alpha.kubernetes.io/hostname: ${ccUrl}
-    external-dns.alpha.kubernetes.io/zone: public
-    cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
-  hosts:
-    - host: ${ccUrl}
-      paths:
-        - path: /
-          pathType: Prefix
-  tls:
-    - hosts:
-        - ${ccUrl}
-      secretName: dp-cc-ui-cert
-${useS3 === true || useS3 === 'true' ? `
-serviceAccount:
-  create: true
-  annotations:
-    "helm.sh/hook": pre-install
-    "helm.sh/hook-weight": "-10"
-    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket` : ''}
-`.trim();
-
-    console.log('Writing configuration files...');
-    await ensureDirectoryExists(path.resolve(`${repoPath}/dp/${site}`));
-
-    await fs.writeFile(
-      `${repoPath}/dp/${site}/cc.app.yaml`,
-      uiCCAppYaml,
-      (err) => {
-        if (err) {
-          console.error(`Failed to write ${repoPath}/dp/${site}/cc.app.yaml file:`, err);
-        } else {
-          console.log(`File ${repoPath}/dp/${site}/cc.app.yaml written successfully.`);
-        }
-      },
-    );
-
-    await fs.writeFile(
-      `${repoPath}/dp/${site}/cc.values.yaml`,
-      uiCCValuesYaml,
-      (err) => {
-        if (err) {
-          console.error(`Failed to write ${repoPath}/dp/${site}/cc.values.yaml file:`, err);
-        } else {
-          console.log(`File ${repoPath}/dp/${site}/cc.values.yaml written successfully.`);
-        }
-      },
-    );
-    console.log('CC-UI configuration is done!');
-  } catch (error) {
-    console.error('Error configuring CC-UI:', error);
-  }
-}
-
 export async function cleanAndWritePropertiesFile(configPath, content) {
   try {
     const cleanedContent = content
@@ -406,12 +255,12 @@ export async function cleanAndWritePropertiesFile(configPath, content) {
     await fs.writeFile(configPath, cleanedContent, 'utf8');
     console.log(`Cleaned and written file to: ${configPath}`);
   } catch (error) {
-    console.error(`Error writing properties file to ${configPath}:`, error.message);
+    console.error('Error writing properties file:', error.message);
     process.exit(1);
   }
 }
 
-export async function updateCoreSiteConfig(site, env, useS3Ui, useS3Gq) {
+export async function updateCoreSiteConfig(site, env, useS3) {
   try {
     const coreSiteEnv = coreSiteEnvMap[env];
 
@@ -427,7 +276,7 @@ export async function updateCoreSiteConfig(site, env, useS3Ui, useS3Gq) {
 
     let siteAWSSecrets = null;
 
-    if (useS3Ui === true || useS3Ui === 'true' || useS3Gq === true || useS3Gq === 'true') {
+    if (useS3 === true || useS3 === 'true') {
       const siteAWSSecretsPath = getVaultSecretsConfigs(site).awsSecretsPath;
       siteAWSSecrets = await getVaultSecrets(siteAWSSecretsPath);
       console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
@@ -435,11 +284,14 @@ export async function updateCoreSiteConfig(site, env, useS3Ui, useS3Gq) {
 
     const coreSiteConfig = `
         ${
-      siteAWSSecrets
-        ? `
+          siteAWSSecrets
+            ? `
 com.docupace.imports.files.FilesImportConfig.aws.accessKeyId=${siteAWSSecrets.AWS_ACCESS_KEY_ID}
 com.docupace.imports.files.FilesImportConfig.aws.accessKeySecret=${siteAWSSecrets.AWS_SECRET_ACCESS_KEY}
-com.docupace.imports.files.FilesImportConfig.aws.region=${siteAWSSecrets.AWS_REGION}`.trim() : ''}
+com.docupace.imports.files.FilesImportConfig.aws.region=${siteAWSSecrets.AWS_REGION}
+`.trim()
+            : ''
+        }
 `;
 
     await fs.ensureDir(path.join(coreSiteConfigRepoPath, site.toUpperCase()));
@@ -466,11 +318,9 @@ async function configureGraphQLServer(
   auth0Token,
   vaultSiteSecretsPath,
   imageTag,
-  revision,
   standardConfigRemoteBranch,
   repoPath,
   commonSecrets,
-  useS3,
 ) {
   siteHost = siteHost.replace('https://', '');
   coreURL = coreURL.replace('https://', '');
@@ -482,7 +332,7 @@ async function configureGraphQLServer(
     const auth0Response = await axios.get(
       `https://${auth0Domain}/api/v2/clients`,
       {
-        headers: {authorization: `Bearer ${auth0Token}`},
+        headers: { authorization: `Bearer ${auth0Token}` },
       },
     );
 
@@ -517,28 +367,13 @@ async function configureGraphQLServer(
 
     await updateVaultSecrets(vaultSiteSecretsPath, graphQLServerSecretData);
 
-    let siteAWSSecrets = null;
-
-    if (useS3 === true || useS3 === 'true') {
-      const siteAWSSecretsPath = getVaultSecretsConfigs(site).awsSecretsPath;
-      siteAWSSecrets = await getVaultSecrets(siteAWSSecretsPath);
-      console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
-    }
-
-    const awsS3Vars = (useS3 === true || useS3 === 'true')
-      ? `
-    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
-    AWS_S3_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
-    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
-    AWS_REGION: vault:secret/data/${site}/aws/config#AWS_REGION`.trim()
-      : '';
-    // Prepare graphql-server.app.yaml
+    // Prepare ui.app.yaml
     const graphQLServerAppYaml = `
 repo: docupace-graphql-server
-revision: ${revision}
+revision: ${standardConfigRemoteBranch}
 `.trim();
 
-    // Prepare graphql-server.values.yaml
+    // Prepare ui.values.yaml
     const graphQLServerValuesYaml = `
 graphqlServer:
   auth0Domain: https://${auth0Domain}
@@ -554,19 +389,9 @@ graphqlServer:
     STANDARD_CONFIG_REMOTE_PATH: vault:secret/data/common/config#STANDARD_CONFIG_REMOTE_PATH
     SITE_CONFIG_REMOTE_PATH: vault:secret/data/${site}/common/config#SITE_CONFIG_REMOTE_PATH
     AUTH0_CC_CLIENT_ID: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_ID
-    AUTH0_CC_CLIENT_SECRET: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_SECRET${awsS3Vars ? '\n    ' + awsS3Vars.trim() : ''}
-${
-      useS3 === true || useS3 === 'true'
-        ? `
-serviceAccount:
-  create: true
-  annotations:
-    "helm.sh/hook": pre-install
-    "helm.sh/hook-weight": "-10"
-    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket`.trim()
-        : ''}
+    AUTH0_CC_CLIENT_SECRET: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_SECRET
 image:
-  repository: registry.paperout.com/docupace-graphql-server-${env}-docker-local/docupace-graphql-server
+  repository: registry.paperout.com/docupace-graphql-server-dev-docker-local/docupace-graphql-server
   tag: ${imageTag}
 imagePullSecrets:
   - name: jf-artifactory
@@ -586,7 +411,8 @@ ingress:
   tls:
     - hosts:
         - ${siteHost}
-      secretName: dp-next-ui-cert`.trim();
+      secretName: dp-next-ui-cert
+`.trim();
 
     // Write configuration files
     console.log('Writing ArgoCD GraphQL Server configuration files...');
@@ -609,13 +435,13 @@ ingress:
       graphQLServerValuesYaml,
       (err) => {
         if (err) {
-          console.error(`Failed to write ${repoPath}/dp/${site}/graphql-server.values.yaml file:`, err);
+          console.error('Failed to write the file:', err);
         } else {
-          console.log(`File ${repoPath}/dp/${site}/graphql-server.values.yaml written successfully.`);
+          console.log('File written successfully.');
         }
       },
     );
-    console.log('GraphQL Server configuration is done!');
+    console.log('Done!');
   } catch (error) {
     console.error('Error configuring GraphQL Server:', error);
   }
@@ -629,9 +455,7 @@ export async function configureFromSite(
   deployUI,
   deployGraphQLServer,
   useNewDomain,
-  useS3Ui,
-  deployCCUI,
-  useS3Gq,
+  useS3,
 ) {
   console.log(
     `Configuring Auth0 tenants and ArgoCD apps for site: ${toSite} in env: ${toEnv} from site: ${fromSite}`,
@@ -656,14 +480,10 @@ export async function configureFromSite(
     auth0ClientSecret,
   );
 
-  // UI MAIN app
+  // UI app
   const uiSecretsPath = getVaultSecretsConfigs(toSite).uiSecretsPath;
   console.log(`uiSecretsPath => ${uiSecretsPath}`);
 
-  // UI CC app
-  const ccUISecretsPath = getVaultSecretsConfigs(toSite).ccUISecretsPath;
-  console.log(`ccUISecretsPath => ${ccUISecretsPath}`);
-
   // GraphQL-Server app
   const graphqlSecretsPath =
     getVaultSecretsConfigs(toSite).graphqlServerSecretsPath;
@@ -683,111 +503,47 @@ export async function configureFromSite(
   //TODO: clone fromEnv and toEnv. replace above with this
 
   // const auth0RepoPath = await cloneRepository('auth0-site-setup');
-  let uiImageTag, uiRevision;
-  if (deployUI === true || deployUI === 'true') {
-    // Read deploy configs
-    const {deployConfig: deployUIConfig} = await readDeployConfig(
-      'ui',
-      fromEnv,
-      fromSite,
-      'values',
-    );
-    const {deployConfig: deployUiRevisionConfig} = await readDeployConfig(
-      'ui',
-      fromEnv,
-      fromSite,
-      'app',
-    );
-
-    uiImageTag = deployUIConfig.image.tag;
-    uiRevision = deployUiRevisionConfig.revision;
-
-    console.log(`Copying Latest UI Revision: ${uiRevision}`);
-  }
-
-  let ccImageTag, ccRevision;
-  if (deployCCUI === true || deployCCUI === 'true') {
-    const {deployConfig: deployCCConfig} = await readDeployConfig(
-      'cc',
-      fromEnv,
-      fromSite,
-      'values',
-    );
 
-    const {deployConfig: deployCCRevisionConfig} = await readDeployConfig(
-      'cc',
-      fromEnv,
-      fromSite,
-      'app',
-    );
-
-    ccImageTag = deployCCConfig.image.tag;
-    ccRevision = deployCCRevisionConfig.revision;
-
-    console.log(`Copying Latest CC Revision: ${ccRevision}`);
-  }
-
-  const {deployConfig: deployGraphQLServerConfig} = await readDeployConfig(
-    'graphql-server',
+  // Read deploy configs
+  const { deployConfig: deployUIConfig } = await readDeployConfig(
+    'ui',
     fromEnv,
     fromSite,
     'values',
   );
+  const uiImageTag = deployUIConfig.image.tag;
 
-  const {deployConfig: deployGraphQLServerRevisionConfig} = await readDeployConfig(
+  const { deployConfig: deployGraphQLServerConfig } = await readDeployConfig(
     'graphql-server',
     fromEnv,
     fromSite,
-    'app',
+    'values',
   );
-
-  const gqRevision = deployGraphQLServerRevisionConfig.revision;
-
-  console.log(`Copying Latest GQ Server Revision: ${gqRevision}`);
-
   const graphqlImageTag = deployGraphQLServerConfig.image.tag;
   const graphqlStandardConfigRemoteBranch =
     deployGraphQLServerConfig.graphqlServer.standardConfigRemoteBranch;
 
-  if (deployUI === true || deployUI === 'true') {
-    console.log(
-      `Copying Latest UI Image Tag: ${uiImageTag} from site: ${fromSite} to site: ${toSite}`,
-    );
-  }
-
-  if (deployCCUI === true || deployCCUI === 'true') {
-    console.log(
-      `Copying Latest CC-UI Image Tag: ${ccImageTag} from site: ${fromSite} to site: ${toSite}`,
-    );
-  }
-
+  console.log(
+    `Copying Latest UI Image Tag: ${deployUIConfig.image.tag} from site: ${fromSite} to site: ${toSite}`,
+  );
   console.log(
     `Copying Latest GraphQL Server Image Tag: ${deployGraphQLServerConfig.image.tag} from site: ${fromSite} to site: ${toSite}`,
   );
 
   const envConfig = environmentConfig[toEnv];
 
-  let CORE_URL,
-    SITE_HOST,
-    CORE_API_CONTEXT,
-    CONNECT_URL,
-    DOCUPACE_HOST;
-  const newUrl = envConfig.newUrl(toSite);
-  const ccUrl = envConfig.ccUrl(toSite);
-
-  SITE_HOST = `${newUrl}`;
-
-  if (useNewDomain === true || useNewDomain === 'true') {
+  let CORE_URL, SITE_HOST, CORE_API_CONTEXT, CONNECT_URL, DOCUPACE_HOST;
+  if (useNewDomain) {
     const newUrl = envConfig.newUrl(toSite);
     CORE_URL = `${newUrl}/core`;
-    // SITE_HOST = newUrl;
+    SITE_HOST = newUrl;
     CORE_API_CONTEXT = 'core';
     CONNECT_URL = `${newUrl}/connect`;
     DOCUPACE_HOST = envConfig.docupaceHost();
   } else {
     const oldUrl = envConfig.oldUrl(toSite);
     CORE_URL = oldUrl;
-    // SITE_HOST = oldUrl;
+    SITE_HOST = oldUrl;
     CORE_API_CONTEXT = toSite;
     CONNECT_URL = `${oldUrl}_ui`;
   }
@@ -796,7 +552,6 @@ export async function configureFromSite(
     await configureUI(
       SITE_HOST,
       CORE_URL,
-      CONNECT_URL,
       DOCUPACE_HOST,
       toSite,
       toEnv,
@@ -806,30 +561,8 @@ export async function configureFromSite(
       auth0Token,
       uiSecretsPath,
       uiImageTag,
-      uiRevision,
-      repoPathToEnv,
-      useS3Ui,
-    );
-  }
-
-  if (deployCCUI === true || deployCCUI === 'true') {
-    await configureCCUI(
-      SITE_HOST,
-      CORE_URL,
-      CONNECT_URL,
-      DOCUPACE_HOST,
-      toSite,
-      toEnv,
-      auth0Domain,
-      auth0ClientId,
-      auth0ClientSecret,
-      auth0Token,
-      ccUISecretsPath,
-      ccImageTag,
-      ccRevision,
       repoPathToEnv,
-      useS3Ui,
-      ccUrl,
+      useS3,
     );
   }
 
@@ -845,17 +578,12 @@ export async function configureFromSite(
     auth0Token,
     graphqlSecretsPath,
     graphqlImageTag,
-    gqRevision,
     graphqlStandardConfigRemoteBranch,
     repoPathToEnv,
     commonSecrets,
-    useS3Gq,
   );
-
-  console.log('Updating Core Site Config...');
-  await updateCoreSiteConfig(toSite, toEnv, useS3Ui, useS3Gq);
   await pushDeployConfig(
     repoPathToEnv,
-    `Config update for ${toSite} from ${fromSite} GraphQL: ${graphqlImageTag}`,
+    `Config update for ${toSite} from ${fromSite} with UI: ${uiImageTag} and GraphQL: ${graphqlImageTag}`,
   );
 }