- Changes in integration test env variables to use the standard vars.

- Make ApiClient env variable support backwards compatible
conductor-oss · Jan 6, 2025 · aabce37 · aabce37
1 parent e89d2a2
commit aabce37
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/java-client-v4-integration-tests.yml b/.github/workflows/java-client-v4-integration-tests.yml
@@ -33,8 +33,8 @@ jobs:
           ./gradlew -p tests test
         env:
           CONDUCTOR_SERVER_URL: ${{ secrets.CONDUCTOR_SERVER_URL }}
-          CONDUCTOR_SERVER_AUTH_KEY: ${{ secrets.CONDUCTOR_SERVER_AUTH_KEY }}
-          CONDUCTOR_SERVER_AUTH_SECRET: ${{ secrets.CONDUCTOR_SERVER_AUTH_SECRET }}
+          CONDUCTOR_AUTH_KEY: ${{ secrets.CONDUCTOR_AUTH_KEY }}
+          CONDUCTOR_AUTH_SECRET: ${{ secrets.CONDUCTOR_AUTH_SECRET }}
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v3
         if: always()

diff --git a/...va/conductor-java-sdk/orkes-client/src/main/java/io/orkes/conductor/client/ApiClient.java b/...va/conductor-java-sdk/orkes-client/src/main/java/io/orkes/conductor/client/ApiClient.java
@@ -174,8 +174,17 @@ public ApiClient build() {
 
         protected void applyEnvVariables() {
             super.applyEnvVariables();
+
             String conductorAuthKey = System.getenv("CONDUCTOR_AUTH_KEY");
+            if (conductorAuthKey == null) {
+                conductorAuthKey = System.getenv("CONDUCTOR_SERVER_AUTH_KEY"); // for backwards compatibility
+            }
+
             String conductorAuthSecret = System.getenv("CONDUCTOR_AUTH_SECRET");
+            if (conductorAuthSecret == null) {
+                conductorAuthSecret = System.getenv("CONDUCTOR_SERVER_AUTH_SECRET"); // for backwards compatibility
+            }
+
             if (conductorAuthKey != null && conductorAuthSecret != null) {
                 this.credentials(conductorAuthKey, conductorAuthSecret);
             }