@docupace/pipeline 1.0.58 → 1.0.60-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.58",
+  "version": "1.0.60-alpha.0",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/auth0/configure.js

@@ -151,15 +151,13 @@ uiMain:
 image:
   repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/enterprise-ui-app
   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`.trim() : ''}`.trim();`
+    eks.amazonaws.com/role-arn: arn:aws:iam::${siteAWSSecrets.AWS_ACCOUNT_ID}:role/eks-pod-identity-connect-next-${env}-${site}-bucket` : ''}
 imagePullSecrets:
   - name: jf-artifactory
 ingress:
@@ -321,11 +319,6 @@ async function configureCCUI(
       : '';
 
     // Prepare cc.app.yaml
-    const uiCCAppYaml = `
-repo: docupace-ui-main
-revision: ${revision}
-`.trim();
-    // Prepare cc.values.yaml
     const uiCCValuesYaml = `
 uiMain:
   auth0BaseUrl: https://${ccUrl}
@@ -361,15 +354,14 @@ ingress:
     - hosts:
         - ${ccUrl}
       secretName: dp-cc-ui-cert
-${
-      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`.trim() : ''}`.trim();
+    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}`));
@@ -691,44 +683,49 @@ 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',
+    );
 
-  // Read deploy configs
-  const {deployConfig: deployUIConfig} = await readDeployConfig(
-    'ui',
-    fromEnv,
-    fromSite,
-    'values',
-  );
-  const {deployConfig: deployUiRevisionConfig} = await readDeployConfig(
-    'ui',
-    fromEnv,
-    fromSite,
-    'app',
-  );
-
-  const uiImageTag = deployUIConfig.image.tag;
-  const uiRevision = deployUiRevisionConfig.revision;
+    uiImageTag = deployUIConfig.image.tag;
+    uiRevision = deployUiRevisionConfig.revision;
 
-  console.log(`Copying Latest UI Revision: ${uiRevision}`);
+    console.log(`Copying Latest UI Revision: ${uiRevision}`);
+  }
 
-  const {deployConfig: deployCCConfig} = await readDeployConfig(
-    'cc',
-    fromEnv,
-    fromSite,
-    'values',
-  );
+  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',
-  );
+    const {deployConfig: deployCCRevisionConfig} = await readDeployConfig(
+      'cc',
+      fromEnv,
+      fromSite,
+      'app',
+    );
 
-  const ccImageTag = deployCCConfig.image.tag;
-  const ccRevision = deployCCRevisionConfig.revision;
+    ccImageTag = deployCCConfig.image.tag;
+    ccRevision = deployCCRevisionConfig.revision;
 
-  console.log(`Copying Latest CC Revision: ${uiRevision}`);
+    console.log(`Copying Latest CC Revision: ${ccRevision}`);
+  }
 
   const {deployConfig: deployGraphQLServerConfig} = await readDeployConfig(
     'graphql-server',
@@ -752,9 +749,18 @@ export async function configureFromSite(
   const graphqlStandardConfigRemoteBranch =
     deployGraphQLServerConfig.graphqlServer.standardConfigRemoteBranch;
 
-  console.log(
-    `Copying Latest UI Image Tag: ${deployUIConfig.image.tag} from site: ${fromSite} to site: ${toSite}`,
-  );
+  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 GraphQL Server Image Tag: ${deployGraphQLServerConfig.image.tag} from site: ${fromSite} to site: ${toSite}`,
   );
@@ -850,6 +856,6 @@ export async function configureFromSite(
   await updateCoreSiteConfig(toSite, toEnv, useS3Ui, useS3Gq);
   await pushDeployConfig(
     repoPathToEnv,
-    `Config update for ${toSite} from ${fromSite} with UI: ${uiImageTag} and GraphQL: ${graphqlImageTag}`,
+    `Config update for ${toSite} from ${fromSite} GraphQL: ${graphqlImageTag}`,
   );
 }

package/src/changeset/cli.js

@@ -110,16 +110,8 @@ program
     if (!process.env.BITBUCKET_PR_ID) {
       return;
     }
-    console.log('🔍 Validating changesets...');
-    try {
-      await validateChangesets();
-      console.log('✅ Changeset validation passed.');
-    } catch {
-      console.error(
-        '❌ No changeset found. Please add a changeset to this PR. Please see more information at https://docupacellc.atlassian.net/wiki/spaces/PM/pages/1350893571/Creating+changesets+for+Docupace+Next',
-      );
-      process.exit(1);
-    }
+    await validateChangesets();
+    process.exit(1);
   });
 // Command: version
 program

package/src/changeset/validate.js

@@ -17,25 +17,31 @@ function areArraysEqualIgnoringOrder(arr1, arr2) {
 }
 
 export async function validateChangesets() {
-  if (isMonoRepo()) {
     await setGitInfo();
     const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
     await $`git fetch origin ${destBranch}:${destBranch}`;
-    await versionStatus(destBranch);
-    /*const changedPackages = await getChangedPackages();
-    const releaseNames = releases.map((release) => release.name);
-    const changedPackageNames = changedPackages.map(
-      (changedPackage) => changedPackage.name,
-    );
+    let releases;
+
+    try {
+      console.log('🔍 Validating changesets...');
+      releases = await versionStatus(destBranch);
+    }
+     catch(e) {
+       console.error(
+           '❌ No changeset found. Please add a changeset to this PR. Please see more information at https://docupacellc.atlassian.net/wiki/spaces/PM/pages/1350893571/Creating+changesets+for+Docupace+Next',
+       );
+       return;
+     }
+
+    if(!['master', 'main'].includes(destBranch)) {
+      if(releases.some(item => item.type !== 'patch')) {
+        console.error('❌ A changeset must be a patch for change to a release branch');
+        return;
+      }
+    }
+
+    console.log('✅ Changeset validation passed.');
 
-    if (!areArraysEqualIgnoringOrder(releaseNames, changedPackageNames)) {
-      throw new Error(
-        'Changesets must be created for all packages created and for those that have those changed as dependencies',
-      );
-    }*/
-  } else {
-    await validateChangesetPath(path.resolve(process.cwd(), CHANGESET_DIR));
-  }
 }
 
 export async function validateChangesetPath(directoryPath) {