From 8c56e51df5e220ada78b6819e5699cf1cde722be Mon Sep 17 00:00:00 2001
From: Justin Ashworth <justin.ashworth@couchbase.com>
Date: Mon, 24 Oct 2022 23:28:15 -0400
Subject: [PATCH] Updates to AWS Deployments for errors

---
 .github/workflows/AWSCouchbaseServerAndSyncGatewayBYOL.yml  | 6 +++---
 .../workflows/AWSCouchbaseServerAndSyncGatewayHourly.yml    | 6 +++---
 aws/CouchbaseServer/deploy.sh                               | 2 +-
 aws/CouchbaseServerAndSyncGateway/deploy.sh                 | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/AWSCouchbaseServerAndSyncGatewayBYOL.yml b/.github/workflows/AWSCouchbaseServerAndSyncGatewayBYOL.yml
index b474309..9f3079c 100644
--- a/.github/workflows/AWSCouchbaseServerAndSyncGatewayBYOL.yml
+++ b/.github/workflows/AWSCouchbaseServerAndSyncGatewayBYOL.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Deploy To AWS
         timeout-minutes: 20
         run: |
-            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol byol 3 7.0.3 2 2.8.3
+            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol byol 3 7.1.2 2 2.8.3
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -85,7 +85,7 @@ jobs:
       - name: Deploy To AWS
         timeout-minutes: 20
         run: |
-            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol-no-sg byol 3 7.0.3 0 2.8.3
+            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol-no-sg byol 3 7.1.2 0 2.8.3
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -127,7 +127,7 @@ jobs:
       - name: Deploy To AWS
         timeout-minutes: 15
         run: |
-            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol-no-cbs byol 0 7.0.3 2 3.0.3
+            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol-no-cbs byol 0 7.1.2 2 3.0.3
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/AWSCouchbaseServerAndSyncGatewayHourly.yml b/.github/workflows/AWSCouchbaseServerAndSyncGatewayHourly.yml
index 6546c67..b8ced0a 100644
--- a/.github/workflows/AWSCouchbaseServerAndSyncGatewayHourly.yml
+++ b/.github/workflows/AWSCouchbaseServerAndSyncGatewayHourly.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Deploy To AWS
         timeout-minutes: 20
         run: |
-            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly hourly-pricing 3 7.0.3 2 3.0.3
+            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly hourly-pricing 3 7.1.2 2 3.0.3
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -85,7 +85,7 @@ jobs:
       - name: Deploy To AWS
         timeout-minutes: 20
         run: |
-            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly-no-sg hourly-pricing 3 7.0.3 0 2.8.3
+            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly-no-sg hourly-pricing 3 7.1.2 0 2.8.3
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -127,7 +127,7 @@ jobs:
       - name: Deploy To AWS
         timeout-minutes: 15
         run: |
-            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly-no-cbs hourly-pricing 0 7.0.3 2 3.0.3
+            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly-no-cbs hourly-pricing 0 7.1.2 2 3.0.3
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/aws/CouchbaseServer/deploy.sh b/aws/CouchbaseServer/deploy.sh
index fc0008b..3b4d736 100755
--- a/aws/CouchbaseServer/deploy.sh
+++ b/aws/CouchbaseServer/deploy.sh
@@ -39,7 +39,7 @@ SERVER_VERSION=${SERVER_VERSION:-$SERVER_VERSION_DEFAULT}
 KEY_NAME=${KEY_NAME:-"couchbase-${REGION}"}
 USERNAME=${USERNAME:-"couchbase"}
 PASSWORD=${PASSWORD:-"foo123!"}
-SERVICES=${SERVICES:-"\"data\,index\,query\""}
+SERVICES=${SERVICES:-"\"data,index,query\""}
 
 ${SCRIPT_DIR}/makeArchives.sh -m "${SCRIPT_DIR}/mappings.json" \
                                  -o "${SCRIPT_DIR}/../../build/aws/CouchbaseServer/" \
diff --git a/aws/CouchbaseServerAndSyncGateway/deploy.sh b/aws/CouchbaseServerAndSyncGateway/deploy.sh
index 4c7bad2..29d8698 100755
--- a/aws/CouchbaseServerAndSyncGateway/deploy.sh
+++ b/aws/CouchbaseServerAndSyncGateway/deploy.sh
@@ -15,7 +15,7 @@ if [ -z "$REGION" ]; then
     REGION="us-east-1"
 fi
 Username="couchbase"
-Password="foo123!"
+Password="foobarbaz123!"
 #KeyName="couchbase-${REGION}"
 KeyName="ja-test-kp"
 SSHCIDR="0.0.0.0/0"