From fb5951c560ad8515f9a83127d6a6ee2badcef650 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 3 Oct 2020 09:42:05 -0500
Subject: [PATCH] =?UTF-8?q?refactor(archival):=20=E2=99=BB=20extract=20arc?=
 =?UTF-8?q?hival-api.env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                  | 4 ----
 archival-api.env      | 4 ++++
 docker-compose.dcproj | 1 +
 docker-compose.yml    | 6 ++----
 4 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 archival-api.env

diff --git a/.env b/.env
index dd34d6cb4..222c88705 100644
--- a/.env
+++ b/.env
@@ -1,12 +1,8 @@
 REVERSE_PROXY_HOST_PORT_HTTP=8080
 REVERSE_PROXY_HOST_PORT_HTTPS=
 
-ARCHIVAL_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY=
 ARCHIVAL_APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH=application-insights
-ARCHIVAL_REDIS_CONNECTION_STRING=archival-scheduling-db:6379
 ARCHIVAL_GIT_REPOSITORY_PATH=archives
-ARCHIVAL_GIT_USER_NAME=FilterLists Archival
-ARCHIVAL_GIT_USER_EMAIL=noreply@filterlists.com
 
 DIRECTORY_HOST=directory-api
 DIRECTORY_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY=
diff --git a/archival-api.env b/archival-api.env
new file mode 100644
index 000000000..a2321aeb0
--- /dev/null
+++ b/archival-api.env
@@ -0,0 +1,4 @@
+ApplicationInsights__InstrumentationKey=
+ConnectionStrings__SchedulingConnection=archival-scheduling-db:6379
+Git__UserName=FilterLists Archival
+Git__UserEmail=noreply@filterlists.com
\ No newline at end of file
diff --git a/docker-compose.dcproj b/docker-compose.dcproj
index e11d4cedc..16e5a4109 100644
--- a/docker-compose.dcproj
+++ b/docker-compose.dcproj
@@ -10,6 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <None Include=".env" />
+    <None Include="archival-api.env" />
     <None Include="api-docs.env" />
     <None Include="docker-compose.directory.migrations.tests.yml" />
     <None Include="docker-compose.override.yml">
diff --git a/docker-compose.yml b/docker-compose.yml
index a2578a6ba..b9b4f49b3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,14 +31,12 @@ services:
     volumes:
       - archival-application-insights:/app/${ARCHIVAL_APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH}
       - archival-archives:/app/${ARCHIVAL_GIT_REPOSITORY_PATH}
+    env_file:
+      - archival-api.env
     environment:
       ApplicationInsights__ServerTelemetryChannelStoragePath: ${ARCHIVAL_APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH}
-      ApplicationInsights__InstrumentationKey: ${ARCHIVAL_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY}
-      ConnectionStrings__SchedulingConnection: ${ARCHIVAL_REDIS_CONNECTION_STRING}
       Api__DirectoryHost: ${DIRECTORY_HOST}
       Git__RepositoryPath: ${ARCHIVAL_GIT_REPOSITORY_PATH}
-      Git__UserName: ${ARCHIVAL_GIT_USER_NAME}
-      Git__UserEmail: ${ARCHIVAL_GIT_USER_EMAIL}
 
   archival-scheduling-db:
     image: redis:alpine