From f6a8cccac24fc4a038957d188b642461ee3824db Mon Sep 17 00:00:00 2001
From: Michael Winsauer <e1429715@student.tuwien.ac.at>
Date: Sun, 20 Jan 2019 15:27:59 +0100
Subject: [PATCH] Move twitter API keys into env file

---
 g6t4.yml                                               |  2 ++
 service-twitter/.dockerignore                          |  1 +
 .../runConfigurations/TwitterServiceApplication.xml    | 10 ++++++++++
 service-twitter/src/main/resources/application.yml     |  8 ++++----
 service-twitter/twitter.env                            |  4 ++++
 5 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 service-twitter/twitter.env

diff --git a/g6t4.yml b/g6t4.yml
index 7d9398f..e9d9615 100644
--- a/g6t4.yml
+++ b/g6t4.yml
@@ -40,6 +40,8 @@ services:
     ports:
       - "8084:8084"
     restart: always
+    env_file:
+      - service-twitter/twitter.env
 
   service-website:
     build: ./service-website
diff --git a/service-twitter/.dockerignore b/service-twitter/.dockerignore
index 01dc736..80eb533 100644
--- a/service-twitter/.dockerignore
+++ b/service-twitter/.dockerignore
@@ -105,3 +105,4 @@ atlassian-ide-plugin.xml
 README.md
 *.iml
 !/.mvn/wrapper/maven-wrapper.jar
+twitter.env
diff --git a/service-twitter/.idea/runConfigurations/TwitterServiceApplication.xml b/service-twitter/.idea/runConfigurations/TwitterServiceApplication.xml
index a350b35..f570e3f 100644
--- a/service-twitter/.idea/runConfigurations/TwitterServiceApplication.xml
+++ b/service-twitter/.idea/runConfigurations/TwitterServiceApplication.xml
@@ -1,6 +1,16 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="TwitterServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <module name="service-twitter" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+        <ENTRY IS_ENABLED="true" PARSER="env" PATH="twitter.env" />
+      </ENTRIES>
+    </extension>
     <option name="SPRING_BOOT_MAIN_CLASS" value="at.aic18.g6t4.servicetwitter.TwitterServiceApplication" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <method v="2">
diff --git a/service-twitter/src/main/resources/application.yml b/service-twitter/src/main/resources/application.yml
index ac49b95..5b941f4 100644
--- a/service-twitter/src/main/resources/application.yml
+++ b/service-twitter/src/main/resources/application.yml
@@ -10,7 +10,7 @@ server:
 twitter4j:
   debug: false
   oauth:
-    consumer-key: "DnmBShVqvJ2xfnRjkAWtq644Z"
-    consumer-secret: "YbP2oAdU9IyuYMAUxbyJn1NNKZ91jnOz1CpNKMSCjCR0Pu8JlJ"
-    access-token: "2698046929-w0qbrGWkqKigFTkAaKCkFJc1XoixWG2FPTlU3i3"
-    access-token-secret: "rx88CHkOLbXUuTHDHOdZLnnw5KDeMQkVD2ltlkqWqWmlP"
+    consumer-key: ${CONSUMER_KEY}
+    consumer-secret: ${CONSUMER_SECRET}
+    access-token: ${ACCESS_TOKEN}
+    access-token-secret: ${ACCESS_TOKEN_SECRET}
diff --git a/service-twitter/twitter.env b/service-twitter/twitter.env
new file mode 100644
index 0000000..5136686
--- /dev/null
+++ b/service-twitter/twitter.env
@@ -0,0 +1,4 @@
+CONSUMER_KEY=DnmBShVqvJ2xfnRjkAWtq644Z
+CONSUMER_SECRET=YbP2oAdU9IyuYMAUxbyJn1NNKZ91jnOz1CpNKMSCjCR0Pu8JlJ
+ACCESS_TOKEN=2698046929-w0qbrGWkqKigFTkAaKCkFJc1XoixWG2FPTlU3i3
+ACCESS_TOKEN_SECRET=rx88CHkOLbXUuTHDHOdZLnnw5KDeMQkVD2ltlkqWqWmlP
-- 
2.43.0