spreadsheets-google: clean up secret management

noi-techpark · Oct 17, 2023 · bb1cf2f · bb1cf2f
1 parent fff8624
commit bb1cf2f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/data-collectors/spreadsheets-google/.env.example b/data-collectors/spreadsheets-google/.env.example
@@ -30,4 +30,7 @@ clientId=odh-mobility-datacollector
 VENDOR=staEcharging
 BASE_URI=https://mobility.share.opendatahub.testingmachine.eu/json
 LOG_LEVEL=debug
-LOG_STYLE=json
+LOG_STYLE=json
+
+google.auth.client_secret_location=file:/credentials/client_secret.json
+google.auth.credentials_folder=file:/credentials
diff --git a/data-collectors/spreadsheets-google/docker-compose.yml b/data-collectors/spreadsheets-google/docker-compose.yml
@@ -24,7 +24,8 @@ services:
       - 9000:9000
       - 9001:9001
     volumes:
-      - ~/.m2/:/var/maven/.m2:Z
+      - ~/.m2/:/var/maven/.m2
       - ./:/code
+      - ./credentials:/credentials
     working_dir: /code
     tty: true
diff --git a/data-collectors/spreadsheets-google/infrastructure/ansible/deploy.yml b/data-collectors/spreadsheets-google/infrastructure/ansible/deploy.yml
@@ -17,3 +17,5 @@
             remote: docker-compose.yml
           - local: ../../.env
             remote: .env
+          - local: ../../credentials
+            remote: credentials
diff --git a/data-collectors/spreadsheets-google/infrastructure/docker-compose.run.yml b/data-collectors/spreadsheets-google/infrastructure/docker-compose.run.yml
@@ -10,3 +10,5 @@ services:
       - .env
     ports:
       - ${SERVER_PORT}:8080
+    volumes:
+      - ./credentials:/credentials
diff --git a/...preadsheets-google/src/main/java/it/bz/odh/spreadsheets/services/GoogleAuthenticator.java b/...preadsheets-google/src/main/java/it/bz/odh/spreadsheets/services/GoogleAuthenticator.java
@@ -35,11 +35,11 @@
 @Service
 public abstract class GoogleAuthenticator {
 
-    @Value("classpath:/META-INF/spring/client_secret.json")
+    @Value("${google.auth.client_secret_location}")
     private Resource clientSecret;
     private NetHttpTransport HTTP_TRANSPORT;
     private JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
-    @Value("classpath:META-INF/credentials")
+    @Value("${google.auth.credentials_folder}")
     private Resource credentialsFolder;
 
     protected Credential getCredentials() throws IOException {

diff --git a/data-collectors/spreadsheets-google/src/main/resources/META-INF/credentials/.gitignore b/data-collectors/spreadsheets-google/src/main/resources/META-INF/credentials/.gitignore