@docupace/pipeline 1.0.4-6.0.1 → 1.0.4

package/src/changeset/validate.js

@@ -1,47 +1,44 @@
-import fs from 'fs';
-import path from 'path';
-
-export async function validateChangesets(directoryPath) {
-  try {
-    // Step 1: Read the directory for md files excluding README.md
-    const allFiles = fs.readdirSync(directoryPath);
-    const mdFiles = allFiles.filter(
-      (file) => file.endsWith('.md') && file !== 'README.md',
-    );
-
-    // Step 2: Check for pre.json and parse it
-    const preJsonPath = path.join(directoryPath, 'pre.json');
-    let preJson;
-
-    if (!fs.existsSync(preJsonPath) && mdFiles.length === 0) {
-      throw new Error('Error: No pre.json and no md files found.');
-    }
-
-    if (fs.existsSync(preJsonPath)) {
-      preJson = JSON.parse(fs.readFileSync(preJsonPath, 'utf-8'));
-
-      if (preJson.mode == 'pre') {
-        // Step 4a: Get list of changesets from pre.json
-        const changesets = preJson.changesets || [];
-        const changesetNames = changesets.map((change) => change);
-
-        // Step 4b: Match files with the list of changesets
-        const mdFileNamesWithoutExt = mdFiles.map((file) =>
-          path.basename(file, '.md'),
-        );
-        const unmatchedFiles = mdFileNamesWithoutExt.filter(
-          (fileName) => !changesetNames.includes(fileName),
-        );
-
-        if (unmatchedFiles.length == 0) {
-          throw new Error('Error: No new MD files found:');
-        }
-      }
-    }
-
-    console.log('Validation successful.');
-  } catch (error) {
-    console.log(error.message);
-    throw error;
-  }
-}
+import fs from 'fs';
+import path from 'path';
+
+export async function validateChangesets(directoryPath) {
+    try {
+        // Step 1: Read the directory for md files excluding README.md
+        const allFiles = fs.readdirSync(directoryPath);
+        const mdFiles = allFiles.filter(file => file.endsWith('.md') && file !== 'README.md');
+
+        // Step 2: Check for pre.json and parse it
+        const preJsonPath = path.join(directoryPath, 'pre.json');
+        let preJson;
+
+        if (!fs.existsSync(preJsonPath) && mdFiles.length === 0) {
+            throw new Error("Error: No pre.json and no md files found.")
+        }
+
+        if (fs.existsSync(preJsonPath)) {
+            preJson = JSON.parse(fs.readFileSync(preJsonPath, 'utf-8'));
+
+            if(preJson.mode == 'pre') {
+                // Step 4a: Get list of changesets from pre.json
+                const changesets = preJson.changesets || [];
+                const changesetNames = changesets.map(change => change);
+
+                // Step 4b: Match files with the list of changesets
+                const mdFileNamesWithoutExt = mdFiles.map(file => path.basename(file, '.md'));
+                const unmatchedFiles = mdFileNamesWithoutExt.filter(fileName => !changesetNames.includes(fileName));
+
+                if (unmatchedFiles.length  == 0) {
+                    throw new Error("Error: No new MD files found:");
+                }
+            }
+        }
+
+        console.log("Validation successful.");
+    } catch (error) {
+        console.log(error.message);
+        throw(error);
+    }
+}
+
+
+

package/src/next/cli.js

@@ -4,207 +4,56 @@ import { Command } from 'commander';
 import { pull } from './pull.js';
 import { sonar } from './sonar.js';
 import { publish } from './publish.js';
-import {
-  deployAppWithTag,
-  deployFromSite,
-  getDefaultDeploySite,
-  getDeployTag,
-} 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')
-  .requiredOption(
-    '-p, --site-config-remote-path <siteConfigRemotePath>',
-    'Site Config Remote Path',
-  )
-  .action(async (options) => {
-    const { siteName, siteConfigRemotePath } = options;
-    await vaultAddSiteData(siteName, siteConfigRemotePath);
-  });
-
-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')
-  .option('-C, --deploy-connect <deployConnect>', 'Deploy Connect', 'false')
-  .action(async (options) => {
-    const { fromEnv, fromSite, toEnv, toSite, deployCore, deployConnect } =
-      options;
-    await deployFromSite(
-      fromEnv,
-      fromSite,
-      toEnv,
-      toSite,
-      deployCore,
-      deployConnect,
-    );
-  });
-
-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);
-  });
-
-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);
-  });
-
-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);
-  });
+    .command('pull <imageName>')
+    .description('Pull a Docker image from the registry')
+    .action(async (imageName) => {
+        await pull(imageName);
+    });
 
 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('sonar')
+    .description('Run Sonar analysis')
+    .action(async () => {
+        await sonar(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('publish')
+    .description('Publish a Docker image')
+    .action(async () => {
+        await publish(GIT_SHA);
+    });
 
 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('deploy <application> <site>')
+    .description('Deploy an application for a specific site')
+    .action(async (application, site) => {
+        await deploy(application, 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);
-  });
+    .command('deployTemplate <site>')
+    .description('Deploy an application for a specific site')
+    .action(async (site) => {
+        await deployTemplate(site);
+    });
 
 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,55 +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}`;
-
-  console.log(
-    `Copying Docker image: ${fromFullImageName} -> ${toFullImageName}`,
-  );
-
-  // 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 target registry
-  await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
-  await $`docker push ${toFullImageName}`;
-}
-
-export async function copy2(repositoryName, fromEnv, toEnv, tag) {
-  console.log(
-    `Copying repository ${repositoryName} from ${fromEnv} to ${toEnv} for tag ${tag}`,
-  );
-  const envInfo = getEnvInfo();
-  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}`;
-
-  console.log(
-    `Copying Docker image: ${fromFullImageName} -> ${toFullImageName}`,
-  );
-
-  // 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 target registry
-  await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
-  await $`docker push ${toFullImageName}`;
-}
+import { $ } from 'zx';
+
+
+/*
+    TARGET_ENV
+    PUBLISH_TAG
+    REPOSITORY_NAME
+ */
+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: ${SOURCE_FULL_IMAGE_NAME} -> ${TARGET_FULL_IMAGE_NAME}`);
+
+    // 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 ${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}`;
+}