@docupace/pipeline 1.0.24-alpha-2 → 1.0.24-alpha-4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.24-alpha-2",
+  "version": "1.0.24-alpha-4",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/auth0/cli.js

@@ -29,7 +29,7 @@ program
   .description('Get Secrets for Vault PATH')
   .action(async (vaultPath) => {
     const data = await getVaultSecrets(vaultPath);
-    console.log(data);
+    console.log(JSON.stringify(data, 'null', 2));
   });
 
 program

package/src/next/connect.js

@@ -36,7 +36,7 @@ const connectUIEnvMap= {
 function log(msg) {
     console.log(`[*] ${msg}`);
   }
-  
+
   /* --------------------------------
    * 1. GIT CHECKOUT
    * -------------------------------- */
@@ -48,21 +48,16 @@ function log(msg) {
       await fs.remove(destDir);
       log(`Cloning ${destDir} repository...`);
     }
-    
+
     const username = process.env.BITBUCKET_USERNAME;
     const password = process.env.BITBUCKET_APP_PASSWORD;
-  
+
     // Construct clone command
     const cloneUrl = `https://${username}:${password}@bitbucket.org/dp-cloud/${repository}.git`;
-  
+
     log(`Perform cloning`);
     await $`git clone --branch=${branch} --depth 1 ${cloneUrl} ${destDir}`;
   }
-  
-  
-
-
-  
 
 export async function connectClone() {
      const connectFromEnv = connectUIEnvMap[process.env.BUILD_ENVIRONMENT];
@@ -78,8 +73,8 @@ export async function connectClone() {
       process.exit(1);
     }
     const siteCommonVaultPath = `secret/data/${site}/common/config`;
-  
-  
+
+
     // 2) getVaultSecrets
     const secretsJson = await getVaultSecrets(siteCommonVaultPath);
     if (!secretsJson.AUTH0_CLIENT_ID) {
@@ -87,12 +82,12 @@ export async function connectClone() {
       process.exit(1);
     }
     const siteCommonSecrets = secretsJson;
-  
+
     // 3) Export secrets as environment variables
     process.env.AUTH0_CLIENT_ID = siteCommonSecrets.AUTH0_CLIENT_ID;
     process.env.AUTH0_CLIENT_SECRET = siteCommonSecrets.AUTH0_CLIENT_SECRET;
-  
-   
+
+
     process.env.AUTH0_REGION_DOMAIN="us.auth0.com";
 
     log(`BUILD_ENVIRONMENT: ${connectToEnv}`);
@@ -100,16 +95,16 @@ export async function connectClone() {
     log(`AUTH0_SUBDOMAIN: ${process.env.AUTH0_SUBDOMAIN}`);
     log(`AUTH0_REGION_DOMAIN: ${process.env.AUTH0_REGION_DOMAIN}`);
     log(`AUTH0_CLIENT_ID: ${process.env.AUTH0_CLIENT_ID}`);
-  
+
     process.env.AUTH0_DOMAIN = `docupace-${process.env.BUILD_ENVIRONMENT}-${process.env.BUILD_SITE}.${process.env.AUTH0_REGION_DOMAIN}`;
-    
+
 
     const projectRoot = process.cwd();
     // 4) Clone 'connect-deploy' into CONNECT_DIR
 
-    
+
     await gitCheckout('connect-deploy', process.env.CONNECT_DIR);
-    
+
     await gitCheckout(`${connectToEnv}-site-settings`, `${process.env.CONNECT_DIR}/${connectToEnv}-site-settings`);
 
     // 5) Create site clone (emulating the dock.sh call)
@@ -121,8 +116,8 @@ export async function connectClone() {
       log('Clone template directory not found:');
       process.exit(1);
     }
-  
-  
+
+
     if (!(await fs.pathExists(cloneTo))) {
       log('New site does not exist. Performing cloning...');
 
@@ -144,13 +139,13 @@ export async function connectClone() {
             console.error('stderr:', error._stderr); // Standard error
         }
     })();
-    
-    
+
+
     } else {
       log('Site already exists. Continuing Auth0 setup...');
     }
-  
-    
+
+
     await (async () => {
       try {
           // Execute the shell command
@@ -173,7 +168,7 @@ export async function connectClone() {
     await $`ls -all ${path.join(cloneTo, 'conf')}`;
     await $`ls -all ${path.join(cloneTo, 'conf/saml')}`;
     await $`cat ${path.join(cloneTo, 'conf/saml/auth0.xml')}`;
-  
+
     // 8) Git add, commit, push
     await $`cd ${cloneTo} && git checkout master && git pull --ff-only`;
     await $`cd ${cloneTo} && git remote -v`;
@@ -181,11 +176,11 @@ export async function connectClone() {
     await $`cd ${cloneTo} && git status`;
     await $`cd ${cloneTo} && git add . ../sites.sh`;
     await $`cd ${cloneTo} && git status`;
-  
+
     const numChanges = (
       await $`cd ${cloneTo} && git diff-index HEAD`
     ).stdout.split('\n').filter(Boolean).length;
-  
+
     if (numChanges > 0) {
       const jiraTicket = process.env.JIRA_TICKET || 'NO_JIRA';
       const message = `${jiraTicket} usdoc-s-builui job download_auth0_metadata for ${connectToEnv}/${process.env.BUILD_SITE}`;
@@ -196,4 +191,4 @@ export async function connectClone() {
       log('No changes have been made. The site likely already has the correct configuration.');
     }
   }
-  
+

package/terraform/init.sh

@@ -33,4 +33,28 @@ echo "$atlassian_workspace_runner_ssh_key" | base64 -d > ~/.ssh/id_ed25519
 chmod 600 ~/.ssh/id_ed25519
 ssh-keyscan bitbucket.org > ~/.ssh/known_hosts
 
-terraform init -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars --reconfigure
+info () {
+  echo "PROJECT => $PROJECT"
+  echo "CURRENT_ENVIRONMENT => $CURRENT_ENVIRONMENT"
+  echo "SITE_NAME => $SITE_NAME"
+}
+
+if [[ "$PROJECT" == "s3" ]]; then
+  info
+  terraform init \
+     -input=false \
+     -reconfigure \
+     -backend=true \
+     -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars \
+     -backend-config="key=us-west-2/${PROJECT}/${SITE_NAME}/${CURRENT_ENVIRONMENT}/terraform.tfstate"
+elif [[ "$PROJECT" == "idp" ]]; then
+  info
+  terraform init \
+     -input=false \
+     -reconfigure \
+     -backend=true \
+     -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars \
+     -backend-config="key=us-west-2/${PROJECT}/${SITE_NAME}/${CURRENT_ENVIRONMENT}/terraform.tfstate"
+else
+  terraform init -backend-config=./env/${CURRENT_ENVIRONMENT}/us-west-2/backend.tfvars --reconfigure
+fi

package/terraform/plan.sh

@@ -39,6 +39,20 @@ if [[ "$PROJECT" == "bb-build-agent-shell" ]]; then
   terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
                  -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/build_agent_configuration.tfvars.json" \
                  -out .tfplan
+elif [[ "$PROJECT" == "s3" ]];then
+  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
+          -var="site=${SITE_NAME}" \
+          -var="env=${CURRENT_ENVIRONMENT}" \
+          -out .tfplan
+elif [[ "$PROJECT" == "idp" ]];then
+  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
+          -var="site=${SITE_NAME}" \
+          -var="env=${CURRENT_ENVIRONMENT}" \
+          -out .tfplan
 else
   terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" -out .tfplan
 fi
+
+
+
+