Merge pull request #57 from HSLdevcom/aks-dev

Update Pulsar version to 3.0.7

Author: thjarvin

.github/workflows/test-and-build.yml

@@ -18,7 +18,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload .jar file
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: transitdata-pubtrans-source.jar
           path: target/transitdata-pubtrans-source.jar
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Download .jar file
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: transitdata-pubtrans-source.jar
           path: target
@@ -49,7 +49,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Download .jar file
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: transitdata-pubtrans-source.jar
           path: target
@@ -60,3 +60,22 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           tag_semver: true
+  build-aks-dev-docker-image:
+    needs: test
+    runs-on: ubuntu-latest
+    # Run only on aks-dev branch
+    if: github.ref == 'refs/heads/aks-dev'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download .jar file
+        uses: actions/download-artifact@v4
+        with:
+          name: transitdata-pubtrans-source.jar
+          path: target
+      - name: Build and publish aks-dev Docker image
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: hsldevcom/transitdata-pubtrans-source
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          tags: aks-dev

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.hsl.transitdata</groupId>
     <artifactId>transitdata-pubtrans-source</artifactId>
-    <version>1.0.7</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <repositories>
@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <common.version>1.3.29</common.version>
+        <common.version>2.0.1</common.version>
     </properties>
 
     <dependencies>

src/main/java/fi/hsl/transitdata/pulsarpubtransconnect/Main.java

@@ -135,8 +135,7 @@ private static Connection createPubtransConnection() throws Exception {
         String connectionString = "";
         try {
             //Default path is what works with Docker out-of-the-box. Override with a local file if needed
-            final String secretFilePath = ConfigUtils.getEnv("FILEPATH_CONNECTION_STRING").orElse("/run/secrets/pubtrans_community_conn_string");
-            connectionString = Files.readString(Paths.get(secretFilePath), StandardCharsets.UTF_8);
+            connectionString = System.getenv("TRANSITDATA_PUBTRANS_CONN_STRING");
         } catch (Exception e) {
             log.error("Failed to read Pubtrans connection string from secrets", e);
             throw e;