spreadsheets-google: configure local dockerized debugging, fix charac…

…ter case of come configuration values
noi-techpark · Jan 19, 2023 · b8e83e7 · b8e83e7
1 parent 09ff76e
commit b8e83e7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 12 deletions.
diff --git a/.github/workflows/ci-spreadsheets-google-sta-echarging.yml b/.github/workflows/ci-spreadsheets-google-sta-echarging.yml
@@ -13,10 +13,10 @@ env:
   DOCKER_TAG: ${{ github.sha }}
   JAVA_VERSION: '8'
   SERVER_PORT: 1020
-  VENDOR: staEcharging
+  VENDOR: STA
   CLIENT_SECRET_BASE64: ${{ secrets.SPREADSHEETS_GOOGLE_CLIENT_SECRET_BASE64 }}
   STORED_CREDENTIAL_BASE64: ${{ secrets.SPREADSHEETS_GOOGLE_STORED_CREDENTIAL_BASE64 }}
-  SPREADSHEET_ID: 1ucCQzAVGmvyRpeq-lIPffALQaWcG4LfPakc2mjt79fY
+  SPREADSHEET_ID: ${{ secrets.SPREADSHEETS_GOOGLE_STA_ECHARGING_SPREADSHEET_ID }}
 
 
 jobs:
@@ -53,10 +53,10 @@ jobs:
           X_VENDOR: ${{ env.VENDOR }}
           X_spreadsheetId: ${{ env.SPREADSHEET_ID }}
           X_suportedLanguages: en,de,it,lad
-          X_headers_nameId: STATION_NAME
-          X_headers_metaDataId: STATE
-          X_headers_latitudeId: LATITUDE
-          X_headers_longitudeId: LONGITUDE
+          X_headers_nameId: station_name
+          X_headers_metaDataId: state
+          X_headers_latitudeId: latitude
+          X_headers_longitudeId: longitude
           X_spreadsheet_range: A1:Z
           X_spreadsheet_notificationUrl: https://spreadsheets.testingmachine.eu/sta-echarging/trigger
           X_stationtype: EChargingStation

diff --git a/data-collectors/spreadsheets-google/.gitignore b/data-collectors/spreadsheets-google/.gitignore
@@ -1,4 +1,5 @@
 client_secret.json
+StoredCredential
 credentials/
 target/
 .env
diff --git a/data-collectors/spreadsheets-google/calls.http b/data-collectors/spreadsheets-google/calls.http
@@ -0,0 +1,12 @@
+##### VSCODE / REST Client https://marketplace.visualstudio.com/items?itemName=humao.rest-client
+# Create a .env file and set the corresponding variables
+# See all $dotenv fields below
+
+# other vars
+@url = http://localhost:9001/trigger 
+
+
+### Classification 
+POST {{url}}
+x-goog-changed: content
+Accept: application/json
diff --git a/data-collectors/spreadsheets-google/docker-compose.yml b/data-collectors/spreadsheets-google/docker-compose.yml
@@ -2,22 +2,22 @@ version: "3.4"
 
 services:
   app:
-    image: maven:3-jdk-8-alpine
+    image: maven:3-eclipse-temurin-11-alpine
     env_file:
       - .env
     environment:
       MAVEN_CONFIG: /var/maven/.m2
-      MAVEN_OPTS: -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=9000
+      MAVEN_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:9000
     entrypoint: >
       mvn
         -Duser.home=/var/maven
-        -Dmaven.tomcat.port=9001
-        tomcat:run
+        -Djetty.http.port=9001
+        jetty:run
     ports:
       - 9000:9000
       - 9001:9001
     volumes:
-      - ~/.m2/:/var/maven/.m2
+      - ~/.m2/:/var/maven/.m2:Z
       - ./:/code
     working_dir: /code
     tty: true
diff --git a/data-collectors/spreadsheets-google/pom.xml b/data-collectors/spreadsheets-google/pom.xml
@@ -7,7 +7,7 @@
 	<version>0.4.0</version>
 	<name>Creative Industries data collector</name>
 	<properties>
-		<java.version>8</java.version>
+		<java.version>11</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.version>5.3.20</spring.version>
 		<finalName>googleSpreadsheets</finalName>
@@ -160,6 +160,11 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>10.0.13</version>
+			</plugin>
 		</plugins>
 	</build>
 </project>