From 6b92c5d21dd2e4ed5cca2a313fda2fe18691c4ad Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <christopher.hoskin@overleaf.com>
Date: Tue, 21 Jul 2020 09:37:48 +0100
Subject: [PATCH] Move acceptance test cred config to docker-compose-config.yml

---
 services/docstore/Jenkinsfile               |  4 +---
 services/docstore/Makefile                  |  3 ---
 services/docstore/buildscript.txt           |  2 +-
 services/docstore/docker-compose-config.yml | 14 ++++++++++++++
 services/docstore/docker-compose.ci.yml     |  6 +++---
 services/docstore/docker-compose.yml        |  6 +++---
 6 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 services/docstore/docker-compose-config.yml

diff --git a/services/docstore/Jenkinsfile b/services/docstore/Jenkinsfile
index 95132d21db..15471816e2 100644
--- a/services/docstore/Jenkinsfile
+++ b/services/docstore/Jenkinsfile
@@ -52,9 +52,7 @@ pipeline {
 
     stage('Acceptance Tests') {
       steps {
-        withCredentials([usernamePassword(credentialsId: 'S3_DOCSTORE_TEST_AWS_KEYS', passwordVariable: 'AWS_SECRET_ACCESS_KEY', usernameVariable: 'AWS_ACCESS_KEY_ID')]) {
-          sh 'AWS_BUCKET="sl-acceptance-tests" AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_acceptance'
-        }
+        sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_acceptance'
       }
     }
 
diff --git a/services/docstore/Makefile b/services/docstore/Makefile
index f4eab58929..7bd0895b81 100644
--- a/services/docstore/Makefile
+++ b/services/docstore/Makefile
@@ -12,9 +12,6 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	BRANCH_NAME=$(BRANCH_NAME) \
 	PROJECT_NAME=$(PROJECT_NAME) \
 	MOCHA_GREP=${MOCHA_GREP} \
-	AWS_BUCKET=${AWS_BUCKET} \
-	AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-	AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
 	docker-compose ${DOCKER_COMPOSE_FLAGS}
 
 DOCKER_COMPOSE_TEST_ACCEPTANCE = \
diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt
index 180a47502d..48c7852d74 100644
--- a/services/docstore/buildscript.txt
+++ b/services/docstore/buildscript.txt
@@ -1,5 +1,5 @@
 docstore
---acceptance-creds=aws
+--acceptance-creds=None
 --dependencies=mongo
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
diff --git a/services/docstore/docker-compose-config.yml b/services/docstore/docker-compose-config.yml
new file mode 100644
index 0000000000..b19d02d48e
--- /dev/null
+++ b/services/docstore/docker-compose-config.yml
@@ -0,0 +1,14 @@
+version: "2.3"
+
+services:
+  dev:
+    environment:
+    - AWS_BUCKET
+    - AWS_ACCESS_KEY_ID
+    - AWS_SECRET_ACCESS_KEY
+
+  ci:
+    environment:
+    - AWS_BUCKET
+    - AWS_ACCESS_KEY_ID
+    - AWS_SECRET_ACCESS_KEY
diff --git a/services/docstore/docker-compose.ci.yml b/services/docstore/docker-compose.ci.yml
index bc11cc116a..53da6509c7 100644
--- a/services/docstore/docker-compose.ci.yml
+++ b/services/docstore/docker-compose.ci.yml
@@ -16,14 +16,14 @@ services:
   test_acceptance:
     build: .
     image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
+    extends:
+      file: docker-compose-config.yml
+      service: ci
     environment:
       ELASTIC_SEARCH_DSN: es:9200
       REDIS_HOST: redis
       MONGO_HOST: mongo
       POSTGRES_HOST: postgres
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
-      AWS_BUCKET: ${AWS_BUCKET}
       MOCHA_GREP: ${MOCHA_GREP}
       NODE_ENV: test
     depends_on:
diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml
index 8dd824af5d..87ea601dd0 100644
--- a/services/docstore/docker-compose.yml
+++ b/services/docstore/docker-compose.yml
@@ -21,14 +21,14 @@ services:
     volumes:
       - .:/app
     working_dir: /app
+    extends:
+      file: docker-compose-config.yml
+      service: dev
     environment:
       ELASTIC_SEARCH_DSN: es:9200
       REDIS_HOST: redis
       MONGO_HOST: mongo
       POSTGRES_HOST: postgres
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
-      AWS_BUCKET: ${AWS_BUCKET}
       MOCHA_GREP: ${MOCHA_GREP}
       LOG_LEVEL: ERROR
       NODE_ENV: test