From 42ec353acecb3ec93028d94be48b65a5eddaf1ef Mon Sep 17 00:00:00 2001
From: Gunasekar K <gunasekark@L-156161609.local>
Date: Thu, 3 Jan 2019 15:47:32 +0530
Subject: [PATCH 1/7] single file configuration

---
 master_deploy.sh | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index 4650af3..a81bd5c 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -248,7 +248,7 @@ for listname in $Buffer_seclist;
 do
     local o=$IFS
     IFS=$(echo -en "\n\b")
-    envvars=$( cat $listname.json | jq  -r ' .app_var ' | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
+    envvars=$( cat $listname.json | jq  -r " .app_var_${ENV} " | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
     log "vars are fetched"
 
     for s in $(echo $envvars | jq -c ".[]" ); do
@@ -489,12 +489,30 @@ deploy_s3bucket() {
 		exit 1
 	fi
 }
+download_configuration()
+{
+    DOWNLOAD_ENV="PROD"
+    AWS_ACCESS_KEY_ID=$(eval "echo \$${DOWNLOAD_ENV}_AWS_ACCESS_KEY_ID")
+    AWS_SECRET_ACCESS_KEY=$(eval "echo \$${DOWNLOAD_ENV}_AWS_SECRET_ACCESS_KEY")
+    AWS_ACCOUNT_ID=$(eval "echo \$${DOWNLOAD_ENV}_AWS_ACCOUNT_ID")
+    AWS_REGION=$(eval "echo \$${DOWNLOAD_ENV}_AWS_REGION")
+    if [ -z $AWS_ACCESS_KEY_ID ] || [ -z $AWS_SECRET_ACCESS_KEY ] || [ -z $AWS_ACCOUNT_ID ] || [ -z $AWS_REGION ];
+    then
+        log "AWS Secret Parameters are not configured in circleci/environment"
+        usage
+        exit 1
+    else
+        configure_aws_cli
+        #aws configure list
+    fi    
+}
 download_envfile()
 {
+    download_configuration
     Buffer_seclist=$(echo $SEC_LIST | sed 's/,/ /g' )
     for listname in $Buffer_seclist;
     do
-        aws s3 cp s3://tc-platform-${ENV_CONFIG}/securitymanager/$listname.json .
+        aws s3 cp s3://tc-platform-prod/securitymanager/$listname.json .
         #cp $HOME/buildscript/securitymanager/$listname.json.enc .
         #SECPASSWD=$(eval "echo \$${listname}")
         #openssl enc -aes-256-cbc -d -md MD5 -in $listname.json.enc -out $listname.json -k $SECPASSWD
@@ -522,7 +540,7 @@ uploading_envvar()
     #   done
         o=$IFS
         IFS=$(echo -en "\n\b")
-        envvars=$( cat $listname.json  | jq  -r ' .awsdeployvar ' | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
+        envvars=$( cat $listname.json  | jq  -r " .awsdeployvar_${ENV} " | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
         for s in $(echo $envvars | jq -c ".[]" ); do
         #echo $envvars
             varname=$(echo $s| jq -r ".name")
@@ -539,12 +557,12 @@ configure_Lambda_template()
     then
         mkdir -p /home/circleci/project/config
         Buffer_seclist=$(echo $SEC_LIST | sed 's/,/ /g')
-	envvars=$( cat $listname.json | jq  -c ' .app_var ')
+	    envvars=$( cat $listname.json | jq  -c " .app_var_${ENV} ")
         for listname in $Buffer_seclist;
         do
 	     o=$IFS
              IFS=$(echo -en "\n\b")
-	     envvars=$( cat $listname.json | jq  -c ' .app_var ')	     
+	     envvars=$( cat $listname.json | jq  -c " .app_var_${ENV} ")	     
 	     echo "$envvars" > /home/circleci/project/config/$AWS_LAMBDA_STAGE.json
 	     sed -i 's/\\n/\\\\n/g' /home/circleci/project/config/$AWS_LAMBDA_STAGE.json
             #yq r $listname.json  >$listname.yml
@@ -640,6 +658,7 @@ ENV_CONFIG=`echo "$ENV" | tr '[:upper:]' '[:lower:]'`
 
 #Validating AWS configuration
 
+download_envfile
 
 #Getting Deployment varaible only
 
@@ -657,7 +676,7 @@ else
      #aws configure list
 fi
 
-download_envfile
+
 #decrypt_fileenc
 uploading_envvar
 

From d103985cd4c209ef971b6ceb926e8b03875a0f94 Mon Sep 17 00:00:00 2001
From: Gunasekar K <gunasekark@L-156161609.local>
Date: Wed, 9 Jan 2019 17:27:01 +0530
Subject: [PATCH 2/7] reverting changes

---
 master_deploy.sh | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index a81bd5c..4650af3 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -248,7 +248,7 @@ for listname in $Buffer_seclist;
 do
     local o=$IFS
     IFS=$(echo -en "\n\b")
-    envvars=$( cat $listname.json | jq  -r " .app_var_${ENV} " | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
+    envvars=$( cat $listname.json | jq  -r ' .app_var ' | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
     log "vars are fetched"
 
     for s in $(echo $envvars | jq -c ".[]" ); do
@@ -489,30 +489,12 @@ deploy_s3bucket() {
 		exit 1
 	fi
 }
-download_configuration()
-{
-    DOWNLOAD_ENV="PROD"
-    AWS_ACCESS_KEY_ID=$(eval "echo \$${DOWNLOAD_ENV}_AWS_ACCESS_KEY_ID")
-    AWS_SECRET_ACCESS_KEY=$(eval "echo \$${DOWNLOAD_ENV}_AWS_SECRET_ACCESS_KEY")
-    AWS_ACCOUNT_ID=$(eval "echo \$${DOWNLOAD_ENV}_AWS_ACCOUNT_ID")
-    AWS_REGION=$(eval "echo \$${DOWNLOAD_ENV}_AWS_REGION")
-    if [ -z $AWS_ACCESS_KEY_ID ] || [ -z $AWS_SECRET_ACCESS_KEY ] || [ -z $AWS_ACCOUNT_ID ] || [ -z $AWS_REGION ];
-    then
-        log "AWS Secret Parameters are not configured in circleci/environment"
-        usage
-        exit 1
-    else
-        configure_aws_cli
-        #aws configure list
-    fi    
-}
 download_envfile()
 {
-    download_configuration
     Buffer_seclist=$(echo $SEC_LIST | sed 's/,/ /g' )
     for listname in $Buffer_seclist;
     do
-        aws s3 cp s3://tc-platform-prod/securitymanager/$listname.json .
+        aws s3 cp s3://tc-platform-${ENV_CONFIG}/securitymanager/$listname.json .
         #cp $HOME/buildscript/securitymanager/$listname.json.enc .
         #SECPASSWD=$(eval "echo \$${listname}")
         #openssl enc -aes-256-cbc -d -md MD5 -in $listname.json.enc -out $listname.json -k $SECPASSWD
@@ -540,7 +522,7 @@ uploading_envvar()
     #   done
         o=$IFS
         IFS=$(echo -en "\n\b")
-        envvars=$( cat $listname.json  | jq  -r " .awsdeployvar_${ENV} " | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
+        envvars=$( cat $listname.json  | jq  -r ' .awsdeployvar ' | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
         for s in $(echo $envvars | jq -c ".[]" ); do
         #echo $envvars
             varname=$(echo $s| jq -r ".name")
@@ -557,12 +539,12 @@ configure_Lambda_template()
     then
         mkdir -p /home/circleci/project/config
         Buffer_seclist=$(echo $SEC_LIST | sed 's/,/ /g')
-	    envvars=$( cat $listname.json | jq  -c " .app_var_${ENV} ")
+	envvars=$( cat $listname.json | jq  -c ' .app_var ')
         for listname in $Buffer_seclist;
         do
 	     o=$IFS
              IFS=$(echo -en "\n\b")
-	     envvars=$( cat $listname.json | jq  -c " .app_var_${ENV} ")	     
+	     envvars=$( cat $listname.json | jq  -c ' .app_var ')	     
 	     echo "$envvars" > /home/circleci/project/config/$AWS_LAMBDA_STAGE.json
 	     sed -i 's/\\n/\\\\n/g' /home/circleci/project/config/$AWS_LAMBDA_STAGE.json
             #yq r $listname.json  >$listname.yml
@@ -658,7 +640,6 @@ ENV_CONFIG=`echo "$ENV" | tr '[:upper:]' '[:lower:]'`
 
 #Validating AWS configuration
 
-download_envfile
 
 #Getting Deployment varaible only
 
@@ -676,7 +657,7 @@ else
      #aws configure list
 fi
 
-
+download_envfile
 #decrypt_fileenc
 uploading_envvar
 

From 7ceef17b22b5f305efda294d27c4b61817af7c07 Mon Sep 17 00:00:00 2001
From: Gunasekar K <gunasekark@L-156161609.local>
Date: Fri, 11 Jan 2019 10:18:35 +0530
Subject: [PATCH 3/7] updating the configuration file access change

---
 buildenv.sh      | 2 +-
 master_deploy.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildenv.sh b/buildenv.sh
index 2ab64d6..aebb8fc 100755
--- a/buildenv.sh
+++ b/buildenv.sh
@@ -42,7 +42,7 @@ uploading_buildenvvar()
     do
         o=$IFS
         IFS=$(echo -en "\n\b")
-        envvars=$( cat $listname.json  | jq  -r ' .circlecibuildvar ' | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
+        envvars=$( cat $listname.json  | jq  -r ' . ' | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
         for s in $(echo $envvars | jq -c ".[]" ); do
         #echo $envvars
             varname=$(echo $s| jq -r ".name")
diff --git a/master_deploy.sh b/master_deploy.sh
index 4650af3..c1222b2 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -248,7 +248,7 @@ for listname in $Buffer_seclist;
 do
     local o=$IFS
     IFS=$(echo -en "\n\b")
-    envvars=$( cat $listname.json | jq  -r ' .app_var ' | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
+    envvars=$( cat $listname.json | jq  -r ' . ' | jq ' . | to_entries[] | { "name": .key , "value": .value } ' | jq -s . )
     log "vars are fetched"
 
     for s in $(echo $envvars | jq -c ".[]" ); do
@@ -539,12 +539,12 @@ configure_Lambda_template()
     then
         mkdir -p /home/circleci/project/config
         Buffer_seclist=$(echo $SEC_LIST | sed 's/,/ /g')
-	envvars=$( cat $listname.json | jq  -c ' .app_var ')
+	#envvars=$( cat $listname.json | jq  -c ' .app_var ')
         for listname in $Buffer_seclist;
         do
 	     o=$IFS
              IFS=$(echo -en "\n\b")
-	     envvars=$( cat $listname.json | jq  -c ' .app_var ')	     
+	     envvars=$( cat $listname.json | jq  -c ' . ')	     
 	     echo "$envvars" > /home/circleci/project/config/$AWS_LAMBDA_STAGE.json
 	     sed -i 's/\\n/\\\\n/g' /home/circleci/project/config/$AWS_LAMBDA_STAGE.json
             #yq r $listname.json  >$listname.yml
@@ -659,7 +659,7 @@ fi
 
 download_envfile
 #decrypt_fileenc
-uploading_envvar
+#uploading_envvar
 
 
 

From b9aa73ba641cd2e043f38f777ef5fa0bdfe73b8a Mon Sep 17 00:00:00 2001
From: Gunasekar K <gunasekark@L-156161609.local>
Date: Fri, 11 Jan 2019 11:59:03 +0530
Subject: [PATCH 4/7] variable update

---
 master_deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index c1222b2..5e752fb 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -55,8 +55,8 @@ EBS_TEMPLATE_FILE_NAME=""
 AWS_S3_KEY_LOCATION=""
 
 #variable for cloud front
-AWS_S3_BUCKET=""
-AWS_S3_SOURCE_SYNC_PATH=""
+#AWS_S3_BUCKET=""
+#AWS_S3_SOURCE_SYNC_PATH=""
 CFCACHE="true"
 
 #variable for Lambda 

From 8acee4e7d535bee3d5cdf2aaefb855f68b5c1126 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <Gunasekar.Kesavalu@wipro.com>
Date: Fri, 11 Jan 2019 20:41:13 +0530
Subject: [PATCH 5/7] Update master_deploy.sh

---
 master_deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index 5e752fb..196452f 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -46,7 +46,7 @@ EBS_APPVER=""
 EBS_TAG=""
 IMAGE=""
 AWS_EBS_APPVER=""
-AWS_S3_BUCKET=""
+#AWS_S3_BUCKET=""
 AWS_S3_KEY=""
 AWS_EB_ENV=""
 EBS_TEMPLATE_FILE_NAME=""

From 4e8bfd3d0fec644c4122a77eb22edaa1f387a356 Mon Sep 17 00:00:00 2001
From: Gunasekar K <gunasekark@L-156161609.local>
Date: Mon, 14 Jan 2019 14:45:54 +0530
Subject: [PATCH 6/7] ECS variable change

---
 master_deploy.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index 196452f..5f10917 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -19,11 +19,11 @@ SEC_LIST=""
 COUNTER_LIMIT=12
 
 #Varibles specific to ECS
-AWS_REPOSITORY=""
-AWS_ECS_CLUSTER=""
-AWS_ECS_SERVICE=""
-AWS_ECS_TASK_FAMILY=""
-AWS_ECS_CONTAINER_NAME=""
+#AWS_REPOSITORY=""
+#AWS_ECS_CLUSTER=""
+#AWS_ECS_SERVICE=""
+#AWS_ECS_TASK_FAMILY=""
+#AWS_ECS_CONTAINER_NAME=""
 ECS_TAG=""
 REVISION=""
 ECS_TEMPLATE_TYPE="EC2"

From 6bb4e357caecfdcb5f758e9ff8bc9fb7842c5f78 Mon Sep 17 00:00:00 2001
From: Gunasekar K <gunasekark@L-156161609.local>
Date: Mon, 14 Jan 2019 15:41:14 +0530
Subject: [PATCH 7/7] EBS variable change

---
 master_deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index 5f10917..a6a2a6c 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -38,7 +38,7 @@ APP_IMAGE_NAME=""
 
 #variable specific to EBS
 DOCKERRUN="Dockerrun.aws.json"
-EBS_EB_EXTENSTION_LOCATION=""
+#EBS_EB_EXTENSTION_LOCATION=""
 IMG_WITH_EBS_TAG=""
 EBS_TEMPLATE_SKELETON_FILE="ebs_base_template_v1.json.template"
 EBS_APPLICATION_NAME=""
@@ -52,7 +52,7 @@ AWS_EB_ENV=""
 EBS_TEMPLATE_FILE_NAME=""
 #AWS_EBS_EB_DOCKERRUN_TEMPLATE_LOCATION=$(eval "echo \$${ENV}_AWS_EBS_EB_DOCKERRUN_TEMPLATE_LOCATION")
 #AWS_EBS_DOCKERRUN_TEMPLATE=$(eval "echo \$${ENV}_AWS_EBS_DOCKERRUN_TEMPLATE")
-AWS_S3_KEY_LOCATION=""
+#AWS_S3_KEY_LOCATION=""
 
 #variable for cloud front
 #AWS_S3_BUCKET=""