@docupace/pipeline 1.0.7-7.micro-cli12 → 1.0.7-alpha.1

package/src/next/jenkins.js

@@ -1,123 +1,88 @@
-import axios from 'axios';
-
-const CORE_JENKINS_URL = process.env.CORE_JENKINS_URL;
-const CORE_JOB_NAME = process.env.CORE_JENKINS_JOB_NAME;
-const CORE_USERNAME = process.env.CORE_JENKINS_USERNAME;
-const CORE_API_TOKEN = process.env.CORE_JENKINS_API_TOKEN;
-
-const CONNECT_JENKINS_URL = 'http://usdoc-s-buildui.corp.docupace.com/jenkins';
-const CONNECT_JOB_NAME = 'docupace_build_and_run_site_v2';
-const CONNECT_USERNAME = process.env.CONNECT_JENKINS_USERNAME;
-const CONNECT_API_TOKEN = process.env.CONNECT_JENKINS_API_TOKEN;
-
-export async function deployCore(env, site, liquibase, gitBranch) {
-  const parameters = {
-    environment: env,
-    site: site.toUpperCase(),
-    runLiquibase: liquibase,
-    gitBranch,
-  };
-
-  return callJenkinsJob({
-    jenkinsUrl: CORE_JENKINS_URL,
-    jobName: CORE_JOB_NAME,
-    auth: { username: CORE_USERNAME, password: CORE_API_TOKEN },
-    parameters,
-  });
-}
-
-// eslint-disable-next-line no-unused-vars
-export async function deployConnect(env, site, liquibase, branch) {
-  const parameters = {
-    BUILD_ENVIRONMENT: env,
-    BUILD_SITE: site,
-    RUN_LIQUIBASE: liquibase,
-  };
-
-  return callJenkinsJob({
-    jenkinsUrl: CONNECT_JENKINS_URL,
-    jobName: CONNECT_JOB_NAME,
-    auth: { username: CONNECT_USERNAME, password: CONNECT_API_TOKEN },
-    parameters,
-  });
-}
-
-export async function callJenkinsJob({
-  jenkinsUrl,
-  jobName,
-  auth,
-  parameters,
-}) {
-  try {
-    // Trigger the job
-    console.log('Triggering Jenkins job...');
-    const buildResponse = await axios.post(
-      `${jenkinsUrl}/job/${jobName}/buildWithParameters`,
-      new URLSearchParams(parameters),
-      {
-        auth,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        validateStatus: (status) => status === 201 || status === 302, // Accept 201 and 302 as valid statuses
-      },
-    );
-
-    const queueUrl = buildResponse.headers.location;
-    console.log(`Job queued at: ${queueUrl}`);
-
-    // Poll queue for executable URL
-    let jobUrl = null;
-    while (!jobUrl) {
-      const queueResponse = await axios.get(`${queueUrl}api/json`, {
-        auth,
-      });
-      jobUrl = queueResponse.data.executable?.url || null;
-
-      if (!jobUrl) {
-        console.log('Waiting for job to start...');
-        await new Promise((resolve) => setTimeout(resolve, 5000));
-      }
-    }
-
-    jobUrl = jobUrl.replaceAll('https', 'http');
-
-    console.log(`Job started at: ${jobUrl}`);
-
-    // Stream console output
-    const consoleUrl = `${jobUrl}consoleText`;
-    let lastSize = 0;
-
-    console.log('Streaming job output...');
-    while (true) {
-      const consoleResponse = await axios.get(consoleUrl, {
-        auth,
-        responseType: 'text',
-      });
-
-      const consoleText = consoleResponse.data;
-      const newOutput = consoleText.slice(lastSize);
-      process.stdout.write(newOutput); // Write new output to console
-      lastSize = consoleText.length;
-
-      // Check job status
-      const jobResponse = await axios.get(`${jobUrl}api/json`, {
-        auth,
-      });
-      const result = jobResponse.data.result;
-
-      if (result) {
-        console.log(`\nJob completed with result: ${result}`);
-        if (result === 'SUCCESS') {
-          return;
-        } else {
-          throw new Error('Jenkins job failed');
-        }
-      }
-
-      // Wait before polling again
-      await new Promise((resolve) => setTimeout(resolve, 5000));
-    }
-  } catch (error) {
-    console.error('Error:', error.message);
-    throw error;
-  }
-}
+import axios from 'axios';
+
+const JENKINS_URL = 'http://devops.corp.docupace.com';
+const JOB_NAME = 'auto-deploy-site';
+const USERNAME = process.env.CORE_JENKINS_USERNAME;
+const API_TOKEN = process.env.CORE_JENKINS_API_TOKEN;
+
+export async function deployCore(env, site, liquibase, gitBranch) {
+  const parameters = {
+    environment: env,
+    site: site.toUpperCase(),
+    runLiquibase: liquibase,
+    gitBranch,
+  };
+
+  try {
+    // Trigger the job
+    console.log('Triggering Jenkins job...');
+    const buildResponse = await axios.post(
+      `${JENKINS_URL}/job/${JOB_NAME}/buildWithParameters`,
+      new URLSearchParams(parameters),
+      {
+        auth: { username: USERNAME, password: API_TOKEN },
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        validateStatus: (status) => status === 201 || status === 302, // Accept 201 and 302 as valid statuses
+      },
+    );
+
+    const queueUrl = buildResponse.headers.location;
+    console.log(`Job queued at: ${queueUrl}`);
+
+    // Poll queue for executable URL
+    let jobUrl = null;
+    while (!jobUrl) {
+      const queueResponse = await axios.get(`${queueUrl}api/json`, {
+        auth: { username: USERNAME, password: API_TOKEN },
+      });
+      jobUrl = queueResponse.data.executable?.url || null;
+
+      if (!jobUrl) {
+        console.log('Waiting for job to start...');
+        await new Promise((resolve) => setTimeout(resolve, 5000));
+      }
+    }
+
+    jobUrl = jobUrl.replaceAll('https', 'http');
+
+    console.log(`Job started at: ${jobUrl}`);
+
+    // Stream console output
+    const consoleUrl = `${jobUrl}consoleText`;
+    let lastSize = 0;
+
+    console.log('Streaming job output...');
+    while (true) {
+      const consoleResponse = await axios.get(consoleUrl, {
+        auth: { username: USERNAME, password: API_TOKEN },
+        responseType: 'text',
+      });
+
+      const consoleText = consoleResponse.data;
+      const newOutput = consoleText.slice(lastSize);
+      process.stdout.write(newOutput); // Write new output to console
+      lastSize = consoleText.length;
+
+      // Check job status
+      const jobResponse = await axios.get(`${jobUrl}api/json`, {
+        auth: { username: USERNAME, password: API_TOKEN },
+      });
+      const result = jobResponse.data.result;
+
+      if (result) {
+        console.log(`\nJob completed with result: ${result}`);
+        if (result === 'SUCCESS') {
+          return;
+        } else {
+          throw new Error('Jenkins job failed');
+        }
+      }
+
+      // Wait before polling again
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+    }
+  } catch (error) {
+    console.error('Error:', error.message);
+    throw new Error(error);
+  }
+}

package/src/next/pipline.js

@@ -1,114 +1,115 @@
-import axios from 'axios';
-import { getBitbucketInfo } from './config.js';
-
-const BITBUCKET_BASE_URL = 'https://api.bitbucket.org/2.0';
-
-const BITBUCKET_WS_URL = 'https://bitbucket.org/dp-cloud';
-
-async function triggerPipelineByName(
-  repository,
-  pipelineName,
-  branch,
-  variables,
-) {
-  const { username, password, workspace } = getBitbucketInfo();
-  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/`;
-  const auth = {
-    username: username,
-    password: password,
-  };
-
-  const payload = {
-    target: {
-      type: 'pipeline_ref_target',
-      ref_type: 'branch',
-      ref_name: branch,
-      selector: {
-        type: 'custom',
-        pattern: pipelineName,
-      },
-    },
-    variables: variables
-      ? Object.entries(variables).map(([key, value]) => ({
-          key,
-          value,
-          secured: false, // Set to true if the variable should be secure
-        }))
-      : undefined,
-  };
-
-  try {
-    const response = await axios.post(url, payload, { auth });
-    return response.data;
-  } catch (error) {
-    console.error(
-      'Error triggering custom pipeline:',
-      error.response?.data || error.message,
-    );
-    throw error;
-  }
-}
-
-async function getPipelineStatus(repository, pipelineUUID) {
-  const { username, password, workspace } = getBitbucketInfo();
-  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/${pipelineUUID}`;
-  const auth = {
-    username: username,
-    password: password,
-  };
-
-  try {
-    const response = await axios.get(url, { auth });
-    return response.data.state.name;
-  } catch (error) {
-    console.error(
-      'Error fetching pipeline status:',
-      error.response?.data || error.message,
-    );
-    throw error;
-  }
-}
-
-export async function runPipeline(
-  repository,
-  pipelineName,
-  branch,
-  variables,
-  wait = false,
-) {
-  try {
-    console.log(
-      `Triggering custom pipeline: ${pipelineName} for branch: ${branch}...`,
-    );
-    const pipeline = await triggerPipelineByName(
-      repository,
-      pipelineName,
-      branch,
-      variables,
-    );
-
-    const pipelineUUID = pipeline.uuid;
-    const buildNumber = pipeline.build_number;
-
-    console.log(`Pipeline triggered with UUID: ${pipelineUUID}`);
-    console.log(
-      `See results here: ${BITBUCKET_WS_URL}/${repository}/piplines/results/${buildNumber}`,
-    );
-
-    if (!wait) {
-      return;
-    }
-
-    let status = '';
-    do {
-      console.log('Checking pipeline status...');
-      await new Promise((resolve) => setTimeout(resolve, 10000)); // Wait 10 seconds
-      status = await getPipelineStatus(repository, pipelineUUID);
-      console.log(`Pipeline status: ${status}`);
-    } while (['IN_PROGRESS', 'PENDING', 'RUNNING'].includes(status));
-
-    console.log(`Pipeline completed with status: ${status}`);
-  } catch (error) {
-    console.error('Error monitoring pipeline:', error.message);
-  }
-}
+import axios from 'axios';
+import { getBitbucketInfo } from './config.js';
+
+const BITBUCKET_BASE_URL = 'https://api.bitbucket.org/2.0';
+
+const BITBUCKET_WS_URL = 'https://bitbucket.org/dp-cloud';
+
+async function triggerPipelineByName(
+  repository,
+  pipelineName,
+  branch,
+  variables,
+) {
+  const { username, password, workspace } = getBitbucketInfo();
+  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/`;
+  const auth = {
+    username: username,
+    password: password,
+  };
+
+  const payload = {
+    target: {
+      type: 'pipeline_ref_target',
+      ref_type: 'branch',
+      ref_name: branch,
+      selector: {
+        type: 'custom',
+        pattern: pipelineName,
+      },
+    },
+    variables: variables
+      ? Object.entries(variables).map(([key, value]) => ({
+          key,
+          value,
+          secured: false, // Set to true if the variable should be secure
+        }))
+      : undefined,
+  };
+
+  try {
+    const response = await axios.post(url, payload, { auth });
+    return response.data;
+  } catch (error) {
+    console.error(
+      'Error triggering custom pipeline:',
+      error.response?.data || error.message,
+    );
+    throw error;
+  }
+}
+
+async function getPipelineStatus(repository, pipelineUUID) {
+  const { username, password, workspace } = getBitbucketInfo();
+  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/${pipelineUUID}`;
+  const auth = {
+    username: username,
+    password: password,
+  };
+
+  try {
+    const response = await axios.get(url, { auth });
+    return response.data.state.name;
+  } catch (error) {
+    console.error(
+      'Error fetching pipeline status:',
+      error.response?.data || error.message,
+    );
+    throw error;
+  }
+}
+
+export async function runPipeline(
+  repository,
+  pipelineName,
+  branch,
+  variables,
+  wait = false,
+) {
+  try {
+    console.log(
+      `Triggering custom pipeline: ${pipelineName} for branch: ${branch}...`,
+    );
+    const pipeline = await triggerPipelineByName(
+      repository,
+      pipelineName,
+      branch,
+      variables,
+    );
+
+    const pipelineUUID = pipeline.uuid;
+    const buildNumber = pipeline.build_number;
+
+    console.log(`Pipeline triggered with UUID: ${pipelineUUID}`);
+    console.log(
+      `See results here: ${BITBUCKET_WS_URL}/${repository}/piplines/results/${buildNumber}`,
+    );
+
+    if (!wait) {
+      return;
+    }
+
+
+    let status = '';
+    do {
+      console.log('Checking pipeline status...');
+      await new Promise((resolve) => setTimeout(resolve, 10000)); // Wait 10 seconds
+      status = await getPipelineStatus(repository, pipelineUUID);
+      console.log(`Pipeline status: ${status}`);
+    } while (['IN_PROGRESS', 'PENDING', 'RUNNING'].includes(status));
+
+    console.log(`Pipeline completed with status: ${status}`);
+  } catch (error) {
+    console.error('Error monitoring pipeline:', error.message);
+  }
+}

package/src/next/publish.js

@@ -1,71 +1,48 @@
-import { $ } from './logger.js';
-
-const {
-  JF_REGISTRY_URL,
-  JF_REGISTRY_REPO_NAME,
-  JF_REGISTRY_PASSWORD_DEV,
-  JF_REGISTRY_USER_DEV,
-  BITBUCKET_REPO_SLUG,
-  BITBUCKET_BUILD_NUMBER,
-  APP_NAME,
-} = process.env;
-
-const JF_REGISTRY_FULL_URL = `${JF_REGISTRY_URL}/${JF_REGISTRY_REPO_NAME}`;
-
-async function loginRegistry() {
-  await $`echo ${JF_REGISTRY_PASSWORD_DEV} | docker login --username ${JF_REGISTRY_USER_DEV} --password-stdin ${JF_REGISTRY_URL}`;
-}
-
-async function logoutRegistry() {
-  await $`docker logout ${JF_REGISTRY_URL}`;
-}
-
-export async function publish(gitSha) {
-  process.env.DOCKER_HOST = '';
-
-  console.log(JSON.stringify(process.env));
-
-  const IMAGE_PREFIX = APP_NAME ?? BITBUCKET_REPO_SLUG;
-  const BUILD_IMAGE_NAME = `${IMAGE_PREFIX}:build-${BITBUCKET_BUILD_NUMBER}`;
-  const IMAGE_NAME = `${IMAGE_PREFIX}:sha-${gitSha}`;
-
-  console.log(`Publishing Docker image ${IMAGE_NAME}...`);
-
-  await loginRegistry();
-
-  let manifestExists = false;
-  try {
-    $.verbose = false; // Silence output temporarily
-    await $`docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
-    manifestExists = true;
-  } catch {
-    manifestExists = false;
-  } finally {
-    $.verbose = true; // Restore normal output
-  }
-
-  if (manifestExists) {
-    console.log(
-      `Tag sha-${gitSha} already exists in the remote repository. Skipping push.`,
-    );
-  } else {
-    await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
-    await $`docker push ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
-  }
-
-  await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
-  await $`docker push ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
-
-  const gitTags = (await $`git tag --points-at HEAD`).stdout
-    .trim()
-    .split('\n')
-    .filter(Boolean);
-  for (const gitTag of gitTags) {
-    const version = gitTag.includes('@') ? 'v' + gitTag.split('@')[1] : gitTag;
-    const tagName = `${IMAGE_PREFIX}:${version}`;
-    await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${tagName}`;
-    await $`docker push ${JF_REGISTRY_FULL_URL}/${tagName}`;
-  }
-
-  await logoutRegistry();
-}
+import { $ } from 'zx';
+
+export async function publish(GIT_SHA) {
+  const BITBUCKET_REPO_SLUG = process.env.BITBUCKET_REPO_SLUG;
+  const BUILD_IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:build-${process.env.BITBUCKET_BUILD_NUMBER}`;
+  const IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
+  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
+
+  console.log(`Publishing Docker image: ${IMAGE_NAME}`);
+
+  // Docker login
+  await $`echo ${process.env.JF_REGISTRY_PASSWORD_DEV} | docker login --username ${process.env.JF_REGISTRY_USER_DEV} --password-stdin ${process.env.JF_REGISTRY_URL}`;
+
+  // Check if the image already exists
+  try {
+    await $`docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
+    console.log(
+      `Tag sha-${GIT_SHA} already exists in the remote repository. Skipping push.`,
+    );
+  } catch {
+    await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
+    await $`docker push ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
+  }
+
+  // Tag and push build image
+  await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
+  await $`docker push ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
+
+  // Fetch Git tags pointing to the current HEAD
+  const gitTagsOutput = (await $`git tag --points-at HEAD`).stdout.trim();
+  const gitTags = gitTagsOutput.split('\n').filter((tag) => tag);
+
+  // Tag and push each Git tag as a Docker tag
+  if (gitTags.length > 0) {
+    console.log(`Found Git tags pointing to HEAD: ${gitTags.join(', ')}`);
+    for (const gitTag of gitTags) {
+      const dockerTag = `${JF_REGISTRY_FULL_URL}/${BITBUCKET_REPO_SLUG}:${gitTag}`;
+      console.log(`Tagging and pushing Docker image for Git tag: ${gitTag}`);
+      await $`docker tag ${IMAGE_NAME} ${dockerTag}`;
+      await $`docker push ${dockerTag}`;
+    }
+  } else {
+    console.log('No Git tags found pointing to the current HEAD.');
+  }
+
+  // Docker logout
+  await $`docker logout ${process.env.JF_REGISTRY_URL}`;
+}

package/src/next/pull.js

@@ -1,7 +1,7 @@
-import { $ } from 'zx';
-
-export async function pull(imageName) {
-  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
-  console.log(`Pulling Docker image: ${JF_REGISTRY_FULL_URL}/${imageName}`);
-  await $`docker pull ${JF_REGISTRY_FULL_URL}/${imageName}`;
-}
+import { $ } from 'zx';
+
+export async function pull(imageName) {
+  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
+  console.log(`Pulling Docker image: ${JF_REGISTRY_FULL_URL}/${imageName}`);
+  await $`docker pull ${JF_REGISTRY_FULL_URL}/${imageName}`;
+}

package/src/next/sonar.js

@@ -1,23 +1,23 @@
-import { $ } from 'zx';
-
-export async function sonar(GIT_SHA) {
-  const IMAGE_NAME = `${process.env.BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
-  const SONAR_CONTAINER_NAME = `${process.env.BITBUCKET_REPO_SLUG}-${GIT_SHA}`;
-
-  console.log(`Running Sonar analysis on Docker image: ${IMAGE_NAME}`);
-
-  // Remove existing container
-  const existingContainer = (
-    await $`docker ps -a --filter "name=${SONAR_CONTAINER_NAME}" --format "{{.Names}}"`
-  ).stdout.trim();
-  if (existingContainer) {
-    await $`docker rm -f ${SONAR_CONTAINER_NAME}`;
-  }
-
-  await $`docker run --rm \
-    -e BRANCH=${process.env.BITBUCKET_BRANCH} \
-    -e PR_ID=${process.env.BITBUCKET_PR_ID} \
-    -e PR_DESTINATION_BRANCH=${process.env.BITBUCKET_PR_DESTINATION_BRANCH} \
-    -e SONAR_TOKEN=${process.env.SONAR_TOKEN} \
-    --name ${SONAR_CONTAINER_NAME} ${IMAGE_NAME} pnpm sonar`;
-}
+import { $ } from 'zx';
+
+export async function sonar(GIT_SHA) {
+  const IMAGE_NAME = `${process.env.BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
+  const SONAR_CONTAINER_NAME = `${process.env.BITBUCKET_REPO_SLUG}-${GIT_SHA}`;
+
+  console.log(`Running Sonar analysis on Docker image: ${IMAGE_NAME}`);
+
+  // Remove existing container
+  const existingContainer = (
+    await $`docker ps -a --filter "name=${SONAR_CONTAINER_NAME}" --format "{{.Names}}"`
+  ).stdout.trim();
+  if (existingContainer) {
+    await $`docker rm -f ${SONAR_CONTAINER_NAME}`;
+  }
+
+  await $`docker run --rm \
+    -e BRANCH=${process.env.BITBUCKET_BRANCH} \
+    -e PR_ID=${process.env.BITBUCKET_PR_ID} \
+    -e PR_DESTINATION_BRANCH=${process.env.BITBUCKET_PR_DESTINATION_BRANCH} \
+    -e SONAR_TOKEN=${process.env.SONAR_TOKEN} \
+    --name ${SONAR_CONTAINER_NAME} ${IMAGE_NAME} pnpm sonar`;
+}