Revert "Update ci-java.yaml"

This reverts commit af85a4a.
GDATASoftwareAG · Aug 15, 2023 · 77c26fb · 77c26fb
1 parent 47e383e
commit 77c26fb
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/.github/workflows/ci-java.yaml b/.github/workflows/ci-java.yaml
@@ -15,22 +15,6 @@ on:
       - "java/**"
       - ".github/workflows/ci-java.yaml"
   workflow_dispatch:
-    inputs:
-      environment:
-        type: choice
-        description: "Test environment"
-        options: 
-        - production
-        - staging
-        - development
-        default: "production"
-
-env:
-  VAAS_ENVIRONMENT: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/java')) }}
-  CLIENT_ID: ${{ secrets.CLIENT_ID }}
-  CLIENT_SECRET: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/java')) && secrets.CLIENT_SECRET || secrets.STAGING_CLIENT_SECRET }}
-  VAAS_URL: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/java')) && "wss://gateway.production.vaas.gdatasecurity.de" || "wss://gateway.staging.vaas.gdatasecurity.de" }}
-  TOKEN_URL: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/java')) && "https://account.gdata.de/realms/vaas-production/protocol/openid-connect/token" || "https://account-staging.gdata.de/realms/vaas-staging/protocol/openid-connect/token" }}
 
 jobs:
   build-java:
@@ -54,6 +38,11 @@ jobs:
 
       - name: run tests
         if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/java')
+        env:
+          CLIENT_ID: ${{ secrets.CLIENT_ID }}
+          CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
+          VAAS_URL: "wss://gateway.production.vaas.gdatasecurity.de"
+          TOKEN_URL: "https://account.gdata.de/realms/vaas-production/protocol/openid-connect/token"
         uses: gradle/gradle-build-action@v2
         with:
           arguments: test
@@ -62,6 +51,11 @@ jobs:
 
       - name: run tests staging
         if: github.ref != 'refs/heads/main' && ! startsWith(github.ref, 'refs/tags/java')
+        env:
+          CLIENT_ID: ${{ secrets.CLIENT_ID }}
+          CLIENT_SECRET: ${{ secrets.STAGING_CLIENT_SECRET }}
+          VAAS_URL: "wss://gateway.staging.vaas.gdatasecurity.de"
+          TOKEN_URL: "https://account-staging.gdata.de/realms/vaas-staging/protocol/openid-connect/token"
         uses: gradle/gradle-build-action@v2
         with:
           arguments: test
@@ -70,6 +64,8 @@ jobs:
 
       - name: run examples for file
         env:
+          CLIENT_ID: ${{ secrets.CLIENT_ID }}
+          CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
           SCAN_PATH: "src/main/java/de/gdata/vaasexample/Main.java"
         uses: gradle/gradle-build-action@v2
         with:
@@ -78,6 +74,9 @@ jobs:
           build-root-directory: java/examples/VaasExample
 
       - name: run examples for url
+        env:
+          CLIENT_ID: ${{ secrets.CLIENT_ID }}
+          CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
         uses: gradle/gradle-build-action@v2
         with:
           arguments: urlScan