Remove EVENTSTORE prefix from environment variables and use KURRENT

Author: w1am

.github/workflows/plugins-tests.yml

@@ -8,7 +8,7 @@ on:
         type: string
         default: enterprise
 
-      esdb_version:
+      kdb_version:
         required: true
         type: string
 
@@ -57,9 +57,9 @@ jobs:
       - name: Execute Gradle build
         run: ./gradlew ci --tests ${{ matrix.test }}Tests
         env:
-          EVENTSTORE_DOCKER_REGISTRY_ENV: docker.eventstore.com
-          EVENTSTORE_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
-          EVENTSTORE_DOCKER_TAG_ENV: ${{ inputs.esdb_version }}
+          KURRENT_DOCKER_REGISTRY_ENV: docker.eventstore.com
+          KURRENT_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
+          KURRENT_DOCKER_TAG_ENV: ${{ inputs.kdb_version }}
           SECURE: true
 
       - uses: actions/upload-artifact@v3
@@ -97,7 +97,7 @@ jobs:
         env:
           CONTAINER_REGISTRY: docker.eventstore.com
           CONTAINER_IMAGE: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
-          CONTAINER_IMAGE_VERSION: ${{ inputs.esdb_version }}
+          CONTAINER_IMAGE_VERSION: ${{ inputs.kdb_version }}
 
       - name: Generate user certificates
         run: docker compose --file configure-user-certs-for-tests.yml up

.github/workflows/pull-requests.yml

@@ -42,7 +42,7 @@ jobs:
 
     uses: ./.github/workflows/tests.yml
     with:
-      esdb_version: ${{ matrix.version }}
+      kdb_version: ${{ matrix.version }}
 
   plugins-tests:
     needs: build
@@ -55,5 +55,5 @@ jobs:
 
     uses: ./.github/workflows/plugins-tests.yml
     with:
-      esdb_version: ${{ matrix.version }}
+      kdb_version: ${{ matrix.version }}
     secrets: inherit

.github/workflows/test-dispatch.yml

@@ -18,5 +18,5 @@ jobs:
     name: Test
     uses: ./.github/workflows/tests.yml
     with:
-      esdb_version: ${{ inputs.version }}
+      kdb_version: ${{ inputs.version }}
       runtime_env: ${{ inputs.runtime_env }}

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ on:
         type: string
         default: release
 
-      esdb_version:
+      kdb_version:
         required: true
         type: string
 
@@ -44,9 +44,9 @@ jobs:
       - name: Execute Gradle build
         run: ./gradlew ci --tests ${{ matrix.test }}Tests
         env:
-          EVENTSTORE_DOCKER_REGISTRY_ENV: docker.eventstore.com
-          EVENTSTORE_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
-          EVENTSTORE_DOCKER_TAG_ENV: ${{ inputs.esdb_version }}
+          KURRENT_DOCKER_REGISTRY_ENV: docker.eventstore.com
+          KURRENT_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
+          KURRENT_DOCKER_TAG_ENV: ${{ inputs.kdb_version }}
 
       - uses: actions/upload-artifact@v3
         if: failure()
@@ -85,9 +85,9 @@ jobs:
       - name: Execute Gradle build
         run: ./gradlew ci --tests ${{ matrix.test }}Tests
         env:
-          EVENTSTORE_DOCKER_REGISTRY_ENV: docker.eventstore.com
-          EVENTSTORE_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
-          EVENTSTORE_DOCKER_TAG_ENV: ${{ inputs.esdb_version }}
+          KURRENT_DOCKER_REGISTRY_ENV: docker.eventstore.com
+          KURRENT_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
+          KURRENT_DOCKER_TAG_ENV: ${{ inputs.kdb_version }}
           SECURE: true
 
       - uses: actions/upload-artifact@v3
@@ -114,7 +114,7 @@ jobs:
         env:
           CONTAINER_REGISTRY: docker.eventstore.com
           CONTAINER_IMAGE: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
-          CONTAINER_IMAGE_VERSION: ${{ inputs.esdb_version }}
+          CONTAINER_IMAGE_VERSION: ${{ inputs.kdb_version }}
 
       - name: Set up JDK 8
         uses: actions/setup-java@v3

db-client-java/src/test/java/io/kurrent/dbclient/DatabaseFactory.java

@@ -37,13 +37,13 @@ private static DockerContainerDatabase.Builder singleNodeBuilder() {
         return DockerContainerDatabase
                 .builder()
                 .registry(Optional
-                        .ofNullable(System.getenv("EVENTSTORE_DOCKER_REGISTRY_ENV"))
+                        .ofNullable(System.getenv("KURRENT_DOCKER_REGISTRY_ENV"))
                         .orElse(DockerContainerDatabase.DEFAULT_REGISTRY))
                 .image(Optional
-                        .ofNullable(System.getenv("EVENTSTORE_DOCKER_IMAGE_ENV"))
+                        .ofNullable(System.getenv("KURRENT_DOCKER_IMAGE_ENV"))
                         .orElse(DockerContainerDatabase.DEFAULT_IMAGE))
                 .version(Optional
-                        .ofNullable(System.getenv("EVENTSTORE_DOCKER_TAG_ENV"))
+                        .ofNullable(System.getenv("KURRENT_DOCKER_TAG_ENV"))
                         .orElse(DockerContainerDatabase.DEFAULT_VERSION));
     }
 }