From 36d4e21807b571c8ea055ef691b1b1cca5d65fcb Mon Sep 17 00:00:00 2001
From: Michael Nguyen <michael.nguyen@parivedasolutions.com>
Date: Mon, 2 Dec 2019 19:22:58 -0600
Subject: [PATCH] adding env variables
---
.../Manual/01-CreateCodePipeline.yml | 33 +++++++++++++++++++
.../indexer-aws/buildspec-post-deploy.yml | 2 +-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/provider/indexer-aws/CloudFormation/Manual/01-CreateCodePipeline.yml b/provider/indexer-aws/CloudFormation/Manual/01-CreateCodePipeline.yml
index 86c48f62f..7084f810b 100644
--- a/provider/indexer-aws/CloudFormation/Manual/01-CreateCodePipeline.yml
+++ b/provider/indexer-aws/CloudFormation/Manual/01-CreateCodePipeline.yml
@@ -334,6 +334,39 @@ Resources:
- Name: QUEUE_IMAGE_REPO_NAME
Type: PLAINTEXT
Value: !Sub ${Environment}-${CodeCommitRepositoryName}-queue-repository
+ - Name: INDEXER_QUEUE_NAME
+ Type: PLAINTEXT
+ Value: dev-osdu-storage-queue
+ - Name: INDEXER_API
+ Type: PLAINTEXT
+ Value: ECSALB-os-indexer-1927005132.us-east-1.elb.amazonaws.com/*api/*indexer/v2/_dps/task-handlers/index-worker
+ - Name: AWS_DEADLETTER_QUEUE_NAME
+ Type: PLAINTEXT
+ Value: dev-osdu-storage-dead-letter-queue
+ - Name: MAX_INDEX_THREADS
+ Type: PLAINTEXT
+ Value: 50
+ - Name: MAX_REQUEST_COUNT
+ Type: PLAINTEXT
+ Value: 10
+ - Name: MAX_MESSAGE_COUNT
+ Type: PLAINTEXT
+ Value: 100000
+ - Name: KEEP_ALIVE_IN_MINUTES
+ Type: PLAINTEXT
+ Value: 9999
+ - Name: AWS_COGNITO_CLIENT_ID
+ Type: PLAINTEXT
+ Value: 3rmgmg8mup281ttc1mbut1pimc
+ - Name: AWS_COGNITO_AUTH_FLOW
+ Type: PLAINTEXT
+ Value: USER_PASSWORD_AUTH
+ - Name: AWS_COGNITO_AUTH_PARAMS_USER
+ Type: PLAINTEXT
+ Value: test-user-with-access@testing.com
+ - Name: AWS_COGNITO_AUTH_PARAMS_PASSWORD
+ Type: PLAINTEXT
+ Value: Password123*
PrivilegedMode: true
Source:
BuildSpec: ./provider/indexer-aws/buildspec-post-deploy.yml
diff --git a/provider/indexer-aws/buildspec-post-deploy.yml b/provider/indexer-aws/buildspec-post-deploy.yml
index fbcfbf3c0..ff631e4d7 100644
--- a/provider/indexer-aws/buildspec-post-deploy.yml
+++ b/provider/indexer-aws/buildspec-post-deploy.yml
@@ -66,7 +66,7 @@ phases:
- mvn clean test -U -f provider/indexer-aws/indexer-queue-aws/pom.xml -Ddeployment.environment=$ENVIRONMENT -Ddeployment.repositorybucket=$S3_MAVEN_REPOSITORY -Daws.accessKeyId=$AWS_ACCESS_KEY_ID_MAVEN -Daws.secretKey=$AWS_SECRET_ACCESS_KEY_MAVEN -Dazure.devops.token=$VSTS_FEED_TOKEN -DaltSnapshotDeploymentRepository=snapshot::default::file:../../local-snapshots-dir -DaltReleaseDeploymentRepository=release::default::file:../../local-release-dir -DaltDeploymentRepository=release::default::file:../../local-release-dir
- echo ...os-indexer Java build completed on `date`.
- echo os-indexer beginning packaging to jar...
- - mvn clean deploy -f provider/indexer-aws/indexer-queue-aws/pom.xml -DAWS_REGION=us-east-1 -DAWS_QUEUE_INDEXER_NAME=dev-osdu-storage-queue -DAWS_INDEXER_INDEX_API=ECSALB-os-indexer-1927005132.us-east-1.elb.amazonaws.com/*api/*indexer/v2/_dps/task-handlers/index-worker=dev-osdu-storage-dead-letter-queue -DAWS_DEADLETTER_QUEUE_NAME -DMAX_INDEX_THREADS=50 -DMAX_REQUEST_COUNT=10 -DMAX_MESSAGE_COUNT=100000 -DKEEP_ALIVE_IN_MINUTES=9999 -DAWS_COGNITO_CLIENT_ID=3rmgmg8mup281ttc1mbut1pimc -DAWS_COGNITO_AUTH_FLOW=USER_PASSWORD_AUTH -DAWS_COGNITO_AUTH_PARAMS_USER=test-user-with-access@testing.com -DAWS_COGNITO_AUTH_PARAMS_PASSWORD=Password123\* -Ddeployment.environment=$ENVIRONMENT -Ddeployment.repositorybucket=$S3_MAVEN_REPOSITORY -Daws.accessKeyId=$AWS_ACCESS_KEY_ID_MAVEN -Daws.secretKey=$AWS_SECRET_ACCESS_KEY_MAVEN -Dazure.devops.token=$VSTS_FEED_TOKEN -DaltSnapshotDeploymentRepository=snapshot::default::file:../../local-snapshots-dir -DaltReleaseDeploymentRepository=release::default::file:../../local-release-dir -DaltDeploymentRepository=release::default::file:../../local-release-dir #Set these are actual secret environment variables to be used
+ - mvn clean deploy -f provider/indexer-aws/indexer-queue-aws/pom.xml -DAWS_REGION=$DEPLOYMENT_REGION -DAWS_QUEUE_INDEXER_NAME=$INDEXER_QUEUE_NAME -DAWS_INDEXER_INDEX_API=$INDEXER_API -DAWS_DEADLETTER_QUEUE_NAME=$AWS_DEADLETTER_QUEUE_NAME -DMAX_INDEX_THREADS=$MAX_INDEX_THREADS -DMAX_REQUEST_COUNT=$MAX_REQUEST_COUNT -DMAX_MESSAGE_COUNT=$MAX_MESSAGE_COUNT -DKEEP_ALIVE_IN_MINUTES=$KEEP_ALIVE_IN_MINUTES -DAWS_COGNITO_CLIENT_ID=$AWS_COGNITO_CLIENT_ID -DAWS_COGNITO_AUTH_FLOW=$AWS_COGNITO_AUTH_FLOW -DAWS_COGNITO_AUTH_PARAMS_USER=$AWS_COGNITO_AUTH_PARAMS_USER -DAWS_COGNITO_AUTH_PARAMS_PASSWORD=$AWS_COGNITO_AUTH_PARAMS_PASSWORD -Ddeployment.environment=$ENVIRONMENT -Ddeployment.repositorybucket=$S3_MAVEN_REPOSITORY -Daws.accessKeyId=$AWS_ACCESS_KEY_ID_MAVEN -Daws.secretKey=$AWS_SECRET_ACCESS_KEY_MAVEN -Dazure.devops.token=$VSTS_FEED_TOKEN -DaltSnapshotDeploymentRepository=snapshot::default::file:../../local-snapshots-dir -DaltReleaseDeploymentRepository=release::default::file:../../local-release-dir -DaltDeploymentRepository=release::default::file:../../local-release-dir #Set these are actual secret environment variables to be used
- echo os-indexer Docker image build started on `date`...
- docker build -f provider/indexer-aws/indexer-queue-aws/Dockerfile -t $QUEUE_IMAGE_REPO_NAME:$IMAGE_TAG .
- docker tag $QUEUE_IMAGE_REPO_NAME:$IMAGE_TAG $AWS_ACCOUNT_NUMBER.dkr.ecr.$DEPLOYMENT_REGION.amazonaws.com/$QUEUE_IMAGE_REPO_NAME:$IMAGE_TAG
--
GitLab