@docupace/pipeline 1.0.48 → 1.0.49

package/next/deploy.sh

@@ -1,40 +1,40 @@
-  #!/bin/bash
-
-  set -e  # Enable command tracing
-  # Variables
-  REPO_NAME="gitops-dev"
-  REPO_URL="https://x-token-auth:$GITOPS_REP_TOKEN@bitbucket.org/dp-cloud/${REPO_NAME}.git"
-  FILE_PATH="dp/$2/$1.values.yaml"
-  BUILD_NUMBER=$BITBUCKET_BUILD_NUMBER
-  GITOPS_BRANCH=master
-  if [ -n "$VERSION_TAG" ]; then
-    DEPLOY_TAG=$VERSION_TAG
-  else
-    DEPLOY_TAG="build-$BUILD_NUMBER"
-  fi
-
-
-
-  # Clone the repository
-
-  git config user.email qxebpukjnzljnwty1knte7ym53aogk@bots.bitbucket.org
-  git clone $REPO_URL
-  cd ${REPO_NAME} || exit
-
-  # Checkout the branch
-
-  # Modify the YAML file
-  sed -i "s/tag: .*/tag: $DEPLOY_TAG/" $FILE_PATH
-
-  # Add changes to git
-  git add $FILE_PATH
-
-  # Commit changes
-  git commit -m "Update image tag to $DEPLOY_TAG"
-
-  # Push changes
-  git push origin $GITOPS_BRANCH
-
-  # Clean up
-  cd ..
-  rm -rf ${REPO_NAME}
+  #!/bin/bash
+
+  set -e  # Enable command tracing
+  # Variables
+  REPO_NAME="gitops-dev"
+  REPO_URL="https://x-token-auth:$GITOPS_REP_TOKEN@bitbucket.org/dp-cloud/${REPO_NAME}.git"
+  FILE_PATH="dp/$2/$1.values.yaml"
+  BUILD_NUMBER=$BITBUCKET_BUILD_NUMBER
+  GITOPS_BRANCH=master
+  if [ -n "$VERSION_TAG" ]; then
+    DEPLOY_TAG=$VERSION_TAG
+  else
+    DEPLOY_TAG="build-$BUILD_NUMBER"
+  fi
+
+
+
+  # Clone the repository
+
+  git config user.email qxebpukjnzljnwty1knte7ym53aogk@bots.bitbucket.org
+  git clone $REPO_URL
+  cd ${REPO_NAME} || exit
+
+  # Checkout the branch
+
+  # Modify the YAML file
+  sed -i "s/tag: .*/tag: $DEPLOY_TAG/" $FILE_PATH
+
+  # Add changes to git
+  git add $FILE_PATH
+
+  # Commit changes
+  git commit -m "Update image tag to $DEPLOY_TAG"
+
+  # Push changes
+  git push origin $GITOPS_BRANCH
+
+  # Clean up
+  cd ..
+  rm -rf ${REPO_NAME}

package/next/execute.sh

@@ -1,123 +1,123 @@
-#!/bin/bash
-
-# Usage: ./pipeline.sh <function> <BITBUCKET_REPO_SLUG>
-# Example: ./pipeline.sh build docupace-ui-main
-
-set -e  # Enable command tracing
-GIT_SHA=$(git log --pretty=format:'%h' -n 1)
-JF_REGISTRY_FULL_URL="${JF_REGISTRY_URL}/${JF_REGISTRY_REPO_NAME}"
-PARAM1=$2
-PARAM2=$3
-
-pull() {
-  IMAGE_NAME=$2
-  docker pull "${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}"
-}
-
-# Function to run Sonar analysis
-sonar() {
-    export DOCKER_HOST=""
-    IMAGE_NAME="${BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}"
-    SONAR_CONTAINER_NAME="${BITBUCKET_REPO_SLUG}-${GIT_SHA}"
-
-    echo "Running Sonar analysis on Docker image ${IMAGE_NAME}..."
-
-    # Remove any existing container with the same name
-    if [ "$(docker ps -a --filter "name=$SONAR_CONTAINER_NAME" --format "{{.Names}}")" ]; then
-        docker rm -f $SONAR_CONTAINER_NAME
-    fi
-
-    cd "$ROOT_DIR"
-    docker run --rm \
-      -e BRANCH=$BITBUCKET_BRANCH \
-      -e PR_ID=$BITBUCKET_PR_ID \
-      -e PR_DESTINATION_BRANCH=$BITBUCKET_PR_DESTINATION_BRANCH \
-      -e SONAR_TOKEN=$SONAR_TOKEN \
-      --name $SONAR_CONTAINER_NAME $IMAGE_NAME pnpm sonar
-}
-
-# Function to publish the Docker image
-
-
-loginRegistry() {
-    echo ${JF_REGISTRY_PASSWORD_DEV} | docker login --username ${JF_REGISTRY_USER_DEV} --password-stdin ${JF_REGISTRY_URL}
-}
-
-logoutRegistry() {
-    docker logout ${JF_REGISTRY_URL}
-}
-
-copy() {
-    DIR="$(dirname "$0")"
-    bash $DIR/copy.sh
-}
-
-publish() {
-    SLUG_SUFFIX=""
-    if [ -n "$APP_NAME" ]; then
-      SLUG_SUFFIX="-${APP_NAME}"
-    fi
-
-    BUILD_IMAGE_NAME="${BITBUCKET_REPO_SLUG}${SLUG_SUFFIX}:build-${BITBUCKET_BUILD_NUMBER}"
-    IMAGE_NAME="${BITBUCKET_REPO_SLUG}${SLUG_SUFFIX}:sha-${GIT_SHA}"
-
-    export DOCKER_HOST=""
-
-    echo "Publishing Docker image ${IMAGE_NAME}..."
-
-    loginRegistry
-
-    # Check if the image already exists in the registry
-    if docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME} >/dev/null 2>&1; then
-        echo "Tag sha-${GIT_SHA} already exists in the remote repository. Skipping push."
-    else
-        docker tag ${IMAGE_NAME} "${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}"
-        docker push "${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}"
-    fi
-
-    # Tag and push the build image
-    docker tag ${IMAGE_NAME} "${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}"
-    docker push "${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}"
-
-    # Tag and push each Git tag as a Docker tag
-    GIT_TAGS=$(git tag --points-at HEAD)
-    for GIT_TAG in ${GIT_TAGS}; do
-        docker tag ${IMAGE_NAME} "${JF_REGISTRY_FULL_URL}/${BITBUCKET_REPO_SLUG}:${GIT_TAG}"
-        docker push "${JF_REGISTRY_FULL_URL}/${BITBUCKET_REPO_SLUG}:${GIT_TAG}"
-    done
-
-    # Logout from Docker registry
-    loginRegistry
-}
-
-# Function to deploy
-# application - ui|graphql
-# site
-deploy() {
-    echo "Deploying $PARAM1 application for site $PARAM2..."
-    DIR="$(dirname "$0")"
-    bash $DIR/deploy.sh $PARAM1 $PARAM2
-}
-
-# Main logic to call the appropriate function
-case "$1" in
-    build)
-        build
-        ;;
-    sonar)
-        sonar
-        ;;
-    publish)
-        publish
-        ;;
-    deploy)
-        deploy
-        ;;
-    copy)
-        copy
-        ;;
-    *)
-        echo "Usage: $0 {build|sonar|publish|deploy|copy} <BITBUCKET_REPO_SLUG>"
-        exit 1
-        ;;
-esac
+#!/bin/bash
+
+# Usage: ./pipeline.sh <function> <BITBUCKET_REPO_SLUG>
+# Example: ./pipeline.sh build docupace-ui-main
+
+set -e  # Enable command tracing
+GIT_SHA=$(git log --pretty=format:'%h' -n 1)
+JF_REGISTRY_FULL_URL="${JF_REGISTRY_URL}/${JF_REGISTRY_REPO_NAME}"
+PARAM1=$2
+PARAM2=$3
+
+pull() {
+  IMAGE_NAME=$2
+  docker pull "${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}"
+}
+
+# Function to run Sonar analysis
+sonar() {
+    export DOCKER_HOST=""
+    IMAGE_NAME="${BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}"
+    SONAR_CONTAINER_NAME="${BITBUCKET_REPO_SLUG}-${GIT_SHA}"
+
+    echo "Running Sonar analysis on Docker image ${IMAGE_NAME}..."
+
+    # Remove any existing container with the same name
+    if [ "$(docker ps -a --filter "name=$SONAR_CONTAINER_NAME" --format "{{.Names}}")" ]; then
+        docker rm -f $SONAR_CONTAINER_NAME
+    fi
+
+    cd "$ROOT_DIR"
+    docker run --rm \
+      -e BRANCH=$BITBUCKET_BRANCH \
+      -e PR_ID=$BITBUCKET_PR_ID \
+      -e PR_DESTINATION_BRANCH=$BITBUCKET_PR_DESTINATION_BRANCH \
+      -e SONAR_TOKEN=$SONAR_TOKEN \
+      --name $SONAR_CONTAINER_NAME $IMAGE_NAME pnpm sonar
+}
+
+# Function to publish the Docker image
+
+
+loginRegistry() {
+    echo ${JF_REGISTRY_PASSWORD_DEV} | docker login --username ${JF_REGISTRY_USER_DEV} --password-stdin ${JF_REGISTRY_URL}
+}
+
+logoutRegistry() {
+    docker logout ${JF_REGISTRY_URL}
+}
+
+copy() {
+    DIR="$(dirname "$0")"
+    bash $DIR/copy.sh
+}
+
+publish() {
+    SLUG_SUFFIX=""
+    if [ -n "$APP_NAME" ]; then
+      SLUG_SUFFIX="-${APP_NAME}"
+    fi
+
+    BUILD_IMAGE_NAME="${BITBUCKET_REPO_SLUG}${SLUG_SUFFIX}:build-${BITBUCKET_BUILD_NUMBER}"
+    IMAGE_NAME="${BITBUCKET_REPO_SLUG}${SLUG_SUFFIX}:sha-${GIT_SHA}"
+
+    export DOCKER_HOST=""
+
+    echo "Publishing Docker image ${IMAGE_NAME}..."
+
+    loginRegistry
+
+    # Check if the image already exists in the registry
+    if docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME} >/dev/null 2>&1; then
+        echo "Tag sha-${GIT_SHA} already exists in the remote repository. Skipping push."
+    else
+        docker tag ${IMAGE_NAME} "${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}"
+        docker push "${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}"
+    fi
+
+    # Tag and push the build image
+    docker tag ${IMAGE_NAME} "${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}"
+    docker push "${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}"
+
+    # Tag and push each Git tag as a Docker tag
+    GIT_TAGS=$(git tag --points-at HEAD)
+    for GIT_TAG in ${GIT_TAGS}; do
+        docker tag ${IMAGE_NAME} "${JF_REGISTRY_FULL_URL}/${BITBUCKET_REPO_SLUG}:${GIT_TAG}"
+        docker push "${JF_REGISTRY_FULL_URL}/${BITBUCKET_REPO_SLUG}:${GIT_TAG}"
+    done
+
+    # Logout from Docker registry
+    loginRegistry
+}
+
+# Function to deploy
+# application - ui|graphql
+# site
+deploy() {
+    echo "Deploying $PARAM1 application for site $PARAM2..."
+    DIR="$(dirname "$0")"
+    bash $DIR/deploy.sh $PARAM1 $PARAM2
+}
+
+# Main logic to call the appropriate function
+case "$1" in
+    build)
+        build
+        ;;
+    sonar)
+        sonar
+        ;;
+    publish)
+        publish
+        ;;
+    deploy)
+        deploy
+        ;;
+    copy)
+        copy
+        ;;
+    *)
+        echo "Usage: $0 {build|sonar|publish|deploy|copy} <BITBUCKET_REPO_SLUG>"
+        exit 1
+        ;;
+esac

package/next/sonar.sh

@@ -1,23 +1,23 @@
-#!/bin/bash
-
-# Initialize sonar-scanner command with common parameters
-SONAR_CMD="npx sonarqube-scanner"
-
-echo "PR_ID=$PR_ID"
-echo "BRANCH=$BRANCH"
-echo "PR_DESTINATION_BRANCH=$PR_DESTINATION_BRANCH"
-
-# Determine the type of scan based on environment variables
-if [[ ! -z "$PR_ID" ]]; then
-  SONAR_CMD+=" \
-    -Dsonar.pullrequest.key=$PR_ID \
-    -Dsonar.pullrequest.branch=$BRANCH \
-    -Dsonar.pullrequest.base=$PR_DESTINATION_BRANCH"
-else
-  SONAR_CMD+=" \
-    -Dsonar.branch.name=$BRANCH"
-fi
-
-# Execute the sonar-scanner command
-echo "Running: $SONAR_CMD"
-$SONAR_CMD
+#!/bin/bash
+
+# Initialize sonar-scanner command with common parameters
+SONAR_CMD="npx sonarqube-scanner"
+
+echo "PR_ID=$PR_ID"
+echo "BRANCH=$BRANCH"
+echo "PR_DESTINATION_BRANCH=$PR_DESTINATION_BRANCH"
+
+# Determine the type of scan based on environment variables
+if [[ ! -z "$PR_ID" ]]; then
+  SONAR_CMD+=" \
+    -Dsonar.pullrequest.key=$PR_ID \
+    -Dsonar.pullrequest.branch=$BRANCH \
+    -Dsonar.pullrequest.base=$PR_DESTINATION_BRANCH"
+else
+  SONAR_CMD+=" \
+    -Dsonar.branch.name=$BRANCH"
+fi
+
+# Execute the sonar-scanner command
+echo "Running: $SONAR_CMD"
+$SONAR_CMD

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/auth0/alias.js

@@ -1,72 +1,72 @@
-import axios from 'axios';
-
-import { createAlias } from '../next/alias.js';
-
-import { getAuth0AuthToken } from './configure.js';
-
-import { getVaultSecrets } from './vault.js';
-
-import { getVaultSecretsConfigs } from '../next/config.js';
-
-import { cloneEnvRepository, readDeployConfig } from '../next/deploy.js';
-
-export async function getCCAlias({ application, auth0Domain, auth0AuthToken }) {
-  console.log(`Forming alias name for application ${application}...`);
-
-  try {
-    const auth0Response = await axios.get(
-      `https://${auth0Domain}/api/v2/clients`,
-      {
-        headers: { authorization: `Bearer ${auth0AuthToken}` },
-      },
-    );
-
-    const appAuth0ClientIdData = auth0Response.data.find(
-      (client) => client.name === `${application}`,
-    );
-    const appAuth0ClientId = appAuth0ClientIdData.client_id;
-
-    console.log(`Client Credentials Alias: ${appAuth0ClientId}@clients`);
-    return `${appAuth0ClientId}@clients`;
-  } catch (err) {
-    console.error(
-      `Failed to form alias name for application: ${application}: ${err.message}`,
-    );
-  }
-}
-
-export async function configureAlias(site, env, username, password, realm) {
-  console.log(`Creating alias for site: ${site} in env: ${env}`);
-  // Site Common Secrets
-  const siteCommonSecretsPath =
-    getVaultSecretsConfigs(site).siteCommonSecretsPath;
-  console.log(`siteCommonSecretsPath => ${siteCommonSecretsPath}`);
-  const siteCommonSecrets = await getVaultSecrets(siteCommonSecretsPath);
-
-  const auth0Domain = `docupace-${env}-${site}.us.auth0.com`;
-  const auth0ClientId = siteCommonSecrets.AUTH0_CLIENT_ID;
-  const auth0ClientSecret = siteCommonSecrets.AUTH0_CLIENT_SECRET;
-  const auth0Token = await getAuth0AuthToken(
-    auth0Domain,
-    auth0ClientId,
-    auth0ClientSecret,
-  );
-
-  await cloneEnvRepository(env);
-
-  const { deployConfig: deployGraphQLServerConfig } = await readDeployConfig(
-    'graphql-server',
-    env,
-    site,
-    'values',
-  );
-  const coreUrl = deployGraphQLServerConfig.graphqlServer.coreUrl;
-
-  const clientCredentialsAlias = await getCCAlias({
-    application: 'docupace-graphql-client-credentials',
-    auth0Domain: auth0Domain,
-    auth0AuthToken: auth0Token,
-  });
-
-  await createAlias(coreUrl, username, password, realm, clientCredentialsAlias);
-}
+import axios from 'axios';
+
+import { createAlias } from '../next/alias.js';
+
+import { getAuth0AuthToken } from './configure.js';
+
+import { getVaultSecrets } from './vault.js';
+
+import { getVaultSecretsConfigs } from '../next/config.js';
+
+import { cloneEnvRepository, readDeployConfig } from '../next/deploy.js';
+
+export async function getCCAlias({ application, auth0Domain, auth0AuthToken }) {
+  console.log(`Forming alias name for application ${application}...`);
+
+  try {
+    const auth0Response = await axios.get(
+      `https://${auth0Domain}/api/v2/clients`,
+      {
+        headers: { authorization: `Bearer ${auth0AuthToken}` },
+      },
+    );
+
+    const appAuth0ClientIdData = auth0Response.data.find(
+      (client) => client.name === `${application}`,
+    );
+    const appAuth0ClientId = appAuth0ClientIdData.client_id;
+
+    console.log(`Client Credentials Alias: ${appAuth0ClientId}@clients`);
+    return `${appAuth0ClientId}@clients`;
+  } catch (err) {
+    console.error(
+      `Failed to form alias name for application: ${application}: ${err.message}`,
+    );
+  }
+}
+
+export async function configureAlias(site, env, username, password, realm) {
+  console.log(`Creating alias for site: ${site} in env: ${env}`);
+  // Site Common Secrets
+  const siteCommonSecretsPath =
+    getVaultSecretsConfigs(site).siteCommonSecretsPath;
+  console.log(`siteCommonSecretsPath => ${siteCommonSecretsPath}`);
+  const siteCommonSecrets = await getVaultSecrets(siteCommonSecretsPath);
+
+  const auth0Domain = `docupace-${env}-${site}.us.auth0.com`;
+  const auth0ClientId = siteCommonSecrets.AUTH0_CLIENT_ID;
+  const auth0ClientSecret = siteCommonSecrets.AUTH0_CLIENT_SECRET;
+  const auth0Token = await getAuth0AuthToken(
+    auth0Domain,
+    auth0ClientId,
+    auth0ClientSecret,
+  );
+
+  await cloneEnvRepository(env);
+
+  const { deployConfig: deployGraphQLServerConfig } = await readDeployConfig(
+    'graphql-server',
+    env,
+    site,
+    'values',
+  );
+  const coreUrl = deployGraphQLServerConfig.graphqlServer.coreUrl;
+
+  const clientCredentialsAlias = await getCCAlias({
+    application: 'docupace-graphql-client-credentials',
+    auth0Domain: auth0Domain,
+    auth0AuthToken: auth0Token,
+  });
+
+  await createAlias(coreUrl, username, password, realm, clientCredentialsAlias);
+}