From 1163dd8e1e316cede0e929f2e63e6001f2c53621 Mon Sep 17 00:00:00 2001
From: Ava Thorn <avatheavian@gmail.com>
Date: Sun, 3 Oct 2021 21:03:14 -0400
Subject: [PATCH] added some deployment changes (#197)

---
 .github/workflows/ci.yml              | 8 +++++---
 .gitignore                            | 3 +--
 Makefile                              | 1 -
 docker-compose.dev.yml                | 7 ++++++-
 docker-compose.yml                    | 4 ++--
 services/bot/migrate-mongo-config.js  | 2 +-
 services/bot/src/secrets.ts           | 2 +-
 services/bot/tests/production.test.ts | 2 +-
 8 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 089f003..9609a4b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,9 +63,11 @@ jobs:
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
-      - run: echo `openssl rand -hex 64` >> mongoPassword
-      - run: echo "DOESNTMATTER" >> token
-      - run: sudo docker run -v $(pwd)/mongoPassword:/run/secrets/mongoPassword -e MONGO_INITDB_ROOT_USERNAME=root -e MONGO_INITDB_DATABASE=qutex -e MONGO_INITDB_ROOT_PASSWORD_FILE=/run/secrets/mongoPassword --name mongo -d -p 27017:27017 mongo:4.4.5
+      - run: |
+          mkdir -p secrets/local/
+          echo `openssl rand -hex 64` >> secrets/local/mongoPassword
+          echo "DOESNTMATTER" >> secrets/local/token
+          sudo docker run -v $(pwd)/secrets/local/mongoPassword:/run/secrets/mongoPassword -e MONGO_INITDB_ROOT_USERNAME=root -e MONGO_INITDB_DATABASE=qutex -e MONGO_INITDB_ROOT_PASSWORD_FILE=/run/secrets/mongoPassword --name mongo -d -p 27017:27017 mongo:4.4.5
       - env:
           QUTEX_TESTING: true
         run: yarn --cwd services/bot test --verbose
diff --git a/.gitignore b/.gitignore
index 970cf49..29d6def 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,8 @@ secrets.env
 result.json
 coverage/
 .DS_Store
-token
-mongoPassword
 site/
+secrets
 
 # Jekyll
 docs/_site
diff --git a/Makefile b/Makefile
index 949bf60..a6d51e8 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ up:
 
 .PHONY: deploy $(VERSION)
 deploy:
-	${MAKE} build
 	./bin/deploy_stack.sh $(VERSION)
 
 .PHONY: logs
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index abb750f..15f5883 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -16,4 +16,9 @@ services:
             context: ./services/bot
     mongo:
         ports:
-            - 27017:27017
\ No newline at end of file
+            - 27017:27017
+secrets:
+    token:
+        file: secrets/local/token
+    mongoPassword:
+        file: secrets/local/mongoPassword
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 564391d..cb44b83 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,8 +54,8 @@ services:
             - mongoPassword
 secrets:
     token:
-        file: token
+        file: secrets/prod/token
     mongoPassword:
-        file: mongoPassword
+        file: secrets/prod/mongoPassword
 volumes:
     mongo_volume:
diff --git a/services/bot/migrate-mongo-config.js b/services/bot/migrate-mongo-config.js
index 1e9e7ef..e2e128b 100644
--- a/services/bot/migrate-mongo-config.js
+++ b/services/bot/migrate-mongo-config.js
@@ -3,7 +3,7 @@ const GET = (secret) => {
     if (['production', 'development'].includes(process.env.NODE_ENV || '')) {
         return FS.readFileSync(`/run/secrets/${secret}`, 'utf8').trim();
     } else {
-        return FS.readFileSync(`../../${secret}`, 'utf8').trim();
+        return FS.readFileSync(`../../secrets/local/${secret}`, 'utf8').trim();
     }
 };
 
diff --git a/services/bot/src/secrets.ts b/services/bot/src/secrets.ts
index d904568..abc8e40 100644
--- a/services/bot/src/secrets.ts
+++ b/services/bot/src/secrets.ts
@@ -14,6 +14,6 @@ export const GET = (secret: string): string => {
     if (['production', 'development'].includes(process.env.NODE_ENV || '')) {
         return fs.readFileSync(`/run/secrets/${secret}`, 'utf8').trim();
     } else {
-        return fs.readFileSync(`../../${secret}`, 'utf8').trim();
+        return fs.readFileSync(`../../secrets/local/${secret}`, 'utf8').trim();
     }
 };
\ No newline at end of file
diff --git a/services/bot/tests/production.test.ts b/services/bot/tests/production.test.ts
index 5ca6bf4..82fcf31 100644
--- a/services/bot/tests/production.test.ts
+++ b/services/bot/tests/production.test.ts
@@ -9,7 +9,7 @@ import mock from 'mock-fs';
 mock({
     '/run/secrets/': {
         'token': 'some token',
-        'mongoPassword': mock.load('../../mongoPassword')
+        'mongoPassword': mock.load('../../secrets/local/mongoPassword')
     },
     'src': mock.load('src'),
     'tests': mock.load('tests'),