@docupace/pipeline 1.0.4-2.apache.2 → 1.0.4-4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/package.json +1 -1
  2. package/src/auth0/configure.js +3 -3
  3. package/src/next/apache.js +6 -2
  4. package/src/next/connect.js +2 -2
  5. package/terraform/apply.sh +12 -1
  6. package/terraform/init.sh +12 -1
  7. package/terraform/plan.sh +35 -22
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@docupace/pipeline",
3
- "version": "1.0.42.apache.2",
3
+ "version": "1.0.44.1",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/auth0/configure.js CHANGED
@@ -146,7 +146,7 @@ uiMain:
146
146
  : ''
147
147
  }
148
148
  image:
149
- repository: registry.paperout.com/docupace-ui-main-dev-docker-local/docupace-ui-main
149
+ repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/docupace-ui-main
150
150
  tag: ${imageTag}
151
151
  ${
152
152
  useS3 === true || useS3 === 'true'
@@ -337,7 +337,7 @@ uiMain:
337
337
  AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
338
338
  AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
339
339
  image:
340
- repository: registry.paperout.com/docupace-ui-main-dev-docker-local/cc-ui-app
340
+ repository: registry.paperout.com/docupace-ui-main-${env}-docker-local/cc-ui-app
341
341
  tag: ${imageTag}
342
342
  imagePullSecrets:
343
343
  - name: jf-artifactory
@@ -554,7 +554,7 @@ graphqlServer:
554
554
  AUTH0_CC_CLIENT_ID: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_ID
555
555
  AUTH0_CC_CLIENT_SECRET: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_SECRET
556
556
  image:
557
- repository: registry.paperout.com/docupace-graphql-server-dev-docker-local/docupace-graphql-server
557
+ repository: registry.paperout.com/docupace-graphql-server-${env}-docker-local/docupace-graphql-server
558
558
  tag: ${imageTag}
559
559
  imagePullSecrets:
560
560
  - name: jf-artifactory
package/src/next/apache.js CHANGED
@@ -22,18 +22,22 @@ export async function addApacheSite() {
22
22
  dev: {
23
23
  host1: 'dev-apalb01a.corp.docupace.com',
24
24
  host2: 'dev-apalb01b.corp.docupace.com',
25
+ repo: 'iis-preprod',
25
26
  },
26
27
  qa: {
27
28
  host1: 'qa-apalb01a.corp.docupace.com',
28
29
  host2: 'qa-apalb01b.corp.docupace.com',
30
+ repo: 'iis-preprod',
29
31
  },
30
32
  uat: {
31
33
  host1: 'uat-apalb01a.edc.docupace.internal',
32
34
  host2: 'uat-apalb01b.edc.docupace.internal',
35
+ repo: 'iis-www2',
33
36
  },
34
37
  stage: {
35
38
  host1: 'stg-apalb01a.edc.docupace.internal',
36
39
  host2: 'stg-apalb01b.edc.docupace.internal',
40
+ repo: 'iis-www2',
37
41
  },
38
42
  };
39
43
 
@@ -54,11 +58,11 @@ export async function addApacheSite() {
54
58
  // The script is run twice in the Bash version
55
59
  await sshCmd(
56
60
  apacheEnvHostMap[process.env.ENVIRONMENT].host1,
57
- `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
61
+ `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
58
62
  );
59
63
 
60
64
  await sshCmd(
61
65
  apacheEnvHostMap[process.env.ENVIRONMENT].host2,
62
- `/root/repo/iis-preprod/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
66
+ `/root/repo/${apacheEnvHostMap[process.env.ENVIRONMENT].repo}/scripts/addsite/add_core_site.sh ${process.env.ENVIRONMENT} ${process.env.SITE}`,
63
67
  );
64
68
  }
package/src/next/connect.js CHANGED
@@ -15,9 +15,9 @@ const vaultAddr = process.env.VAULT_ADDR;
15
15
  const connectUIEnvMap = {
16
16
  dev: 'dev',
17
17
  qa: 'preprod',
18
- stg: 'stg',
18
+ stage: 'stg',
19
19
  uat: 'uat',
20
- prd: 'prod-las',
20
+ prod: 'prod-www3',
21
21
  };
22
22
 
23
23
  function log(msg) {
package/terraform/apply.sh CHANGED
@@ -10,8 +10,19 @@ if [[ -z "$PROJECT" ]]; then
10
10
  exit 1
11
11
  fi
12
12
 
13
+ if [ "$CURRENT_ENVIRONMENT" == "prd" ]; then
14
+ export EKS_CLUSTER_NAME="connect-next-prd-eks-cluster"
15
+ CURRENT_ENVIRONMENT="prod"
16
+ elif [ "$CURRENT_ENVIRONMENT" == "stg" ]; then
17
+ export EKS_CLUSTER_NAME="connect-next-stg-eks-cluster"
18
+ CURRENT_ENVIRONMENT="stage"
19
+ else
20
+ export EKS_CLUSTER_NAME="connect-next-${CURRENT_ENVIRONMENT}-eks-cluster"
21
+ fi
22
+
23
+ echo "Using EKS cluster: $EKS_CLUSTER_NAME"
24
+
13
25
  export SESSION_NAME="EKSAdminSession"
14
- export EKS_CLUSTER_NAME="connect-next-${CURRENT_ENVIRONMENT}-eks-cluster"
15
26
  export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"
16
27
  export ASSUME_ROLE_OUTPUT=$(aws sts assume-role --role-arn $ROLE_ARN --role-session-name $SESSION_NAME)
17
28
  export AWS_ACCESS_KEY_ID=$(echo $ASSUME_ROLE_OUTPUT | jq -r '.Credentials.AccessKeyId')
package/terraform/init.sh CHANGED
@@ -17,8 +17,19 @@ if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
17
17
  exit 1
18
18
  fi
19
19
 
20
+ if [ "$CURRENT_ENVIRONMENT" == "prd" ]; then
21
+ export EKS_CLUSTER_NAME="connect-next-prd-eks-cluster"
22
+ CURRENT_ENVIRONMENT="prod"
23
+ elif [ "$CURRENT_ENVIRONMENT" == "stg" ]; then
24
+ export EKS_CLUSTER_NAME="connect-next-stg-eks-cluster"
25
+ CURRENT_ENVIRONMENT="stage"
26
+ else
27
+ export EKS_CLUSTER_NAME="connect-next-${CURRENT_ENVIRONMENT}-eks-cluster"
28
+ fi
29
+
30
+ echo "Using EKS cluster: $EKS_CLUSTER_NAME"
31
+
20
32
  export SESSION_NAME="EKSAdminSession"
21
- export EKS_CLUSTER_NAME="connect-next-${CURRENT_ENVIRONMENT}-eks-cluster"
22
33
  export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"
23
34
  export ASSUME_ROLE_OUTPUT=$(aws sts assume-role --role-arn $ROLE_ARN --role-session-name $SESSION_NAME)
24
35
  export AWS_ACCESS_KEY_ID=$(echo $ASSUME_ROLE_OUTPUT | jq -r '.Credentials.AccessKeyId')
package/terraform/plan.sh CHANGED
@@ -17,8 +17,19 @@ if [[ -z "$CURRENT_ENVIRONMENT" ]]; then
17
17
  exit 1
18
18
  fi
19
19
 
20
+ if [ "$CURRENT_ENVIRONMENT" == "prd" ]; then
21
+ export EKS_CLUSTER_NAME="connect-next-prd-eks-cluster"
22
+ CURRENT_ENVIRONMENT="prod"
23
+ elif [ "$CURRENT_ENVIRONMENT" == "stg" ]; then
24
+ export EKS_CLUSTER_NAME="connect-next-stg-eks-cluster"
25
+ CURRENT_ENVIRONMENT="stage"
26
+ else
27
+ export EKS_CLUSTER_NAME="connect-next-${CURRENT_ENVIRONMENT}-eks-cluster"
28
+ fi
29
+
30
+ echo "Using EKS cluster: $EKS_CLUSTER_NAME"
31
+
20
32
  export SESSION_NAME="EKSAdminSession"
21
- export EKS_CLUSTER_NAME="connect-next-${CURRENT_ENVIRONMENT}-eks-cluster"
22
33
  export ROLE_ARN="arn:aws:iam::$(aws sts get-caller-identity | jq -r '.Account'):role/$ROLE_NAME"
23
34
  export ASSUME_ROLE_OUTPUT=$(aws sts assume-role --role-arn $ROLE_ARN --role-session-name $SESSION_NAME)
24
35
  export AWS_ACCESS_KEY_ID=$(echo $ASSUME_ROLE_OUTPUT | jq -r '.Credentials.AccessKeyId')
@@ -31,33 +42,35 @@ cd "$BITBUCKET_CLONE_DIR/${PROJECT}"
31
42
 
32
43
  if [[ "$PROJECT" == "bb-build-agent-shell" ]]; then
33
44
  if [[ "$CURRENT_ENVIRONMENT" == "dev" ]]; then
34
- echo "$dev_build_agent_configuration" | base64 -d > ./env/${CURRENT_ENVIRONMENT}/us-west-2/build_agent_configuration.tfvars.json
45
+ echo "$dev_build_agent_configuration" | base64 -d >./env/${CURRENT_ENVIRONMENT}/us-west-2/build_agent_configuration.tfvars.json
35
46
  elif [[ "$CURRENT_ENVIRONMENT" == "qa" ]]; then
36
- echo "$qa_build_agent_configuration" | base64 -d > ./env/${CURRENT_ENVIRONMENT}/us-west-2/build_agent_configuration.tfvars.json
47
+ echo "$qa_build_agent_configuration" | base64 -d >./env/${CURRENT_ENVIRONMENT}/us-west-2/build_agent_configuration.tfvars.json
37
48
  fi
38
49
 
39
50
  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
40
- -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/build_agent_configuration.tfvars.json" \
41
- -out .tfplan
42
- elif [[ "$PROJECT" == "s3" ]];then
51
+ -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/build_agent_configuration.tfvars.json" \
52
+ -out .tfplan
53
+ elif [[ "$PROJECT" == "s3" ]]; then
43
54
  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
44
- -var="site=${SITE_NAME}" \
45
- -var="env=${CURRENT_ENVIRONMENT}" \
46
- -out .tfplan
47
- elif [[ "$PROJECT" == "idp" ]];then
55
+ -var="site=${SITE_NAME}" \
56
+ -var="env=${CURRENT_ENVIRONMENT}" \
57
+ -out .tfplan
58
+ elif [[ "$PROJECT" == "idp" ]]; then
48
59
  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" \
49
- -var="site=${SITE_NAME}" \
50
- -var="env=${CURRENT_ENVIRONMENT}" \
51
- -var="docupace_domain=${DOCUPACE_DOMAIN}" \
52
- -var="docupace_next_domain=${DOCUPACE_NEXT_DOMAIN}" \
53
- -var="old_page_design=${USE_OLD_PAGE_DESIGN}" \
54
- -var="use_new_domain=${USE_NEW_DOMAIN}" \
55
- -var="configure_autologin=${CONFIGURE_AUTOLOGIN}" \
56
- -var="configure_enterprise_ui=${CONFIGURE_ENTERPRISE_UI}" \
57
- -var="enable_mfa=${ENABLE_MFA}" \
58
- -var="configure_ui_cc=${CONFIGURE_UI_CC}" \
59
- -var="configure_precisefp_client_credentials=${CONFIGURE_PRECISEFP_CLIENT_CREDENTIALS}" \
60
- -out .tfplan
60
+ -var="site=${SITE_NAME}" \
61
+ -var="env=${CURRENT_ENVIRONMENT}" \
62
+ -var="docupace_domain=${DOCUPACE_DOMAIN}" \
63
+ -var="docupace_next_domain=${DOCUPACE_NEXT_DOMAIN}" \
64
+ -var="old_page_design=${USE_OLD_PAGE_DESIGN}" \
65
+ -var="use_new_domain=${USE_NEW_DOMAIN}" \
66
+ -var="configure_autologin=${CONFIGURE_AUTOLOGIN}" \
67
+ -var="configure_enterprise_ui=${CONFIGURE_ENTERPRISE_UI}" \
68
+ -var="enable_mfa=${ENABLE_MFA}" \
69
+ -var="configure_ui_cc=${CONFIGURE_UI_CC}" \
70
+ -var="configure_precisefp_client_credentials=${CONFIGURE_PRECISEFP_CLIENT_CREDENTIALS}" \
71
+ -var="use_azuread_app=${USE_AZUREAD_APP}" \
72
+ -var="deploy_azuread_app=${DEPLOY_AZUREAD_APP}" \
73
+ -out .tfplan
61
74
  else
62
75
  terraform plan -var-file="./env/${CURRENT_ENVIRONMENT}/us-west-2/terraform.tfvars" -out .tfplan
63
76
  fi