Merge pull request #44 from conductor-sdk/refactor-tests

Refactored tests to use standard dockerfile between sdks
conductor-sdk · Jan 25, 2023 · 0d1963b · 0d1963b
2 parents 70d5214 + 492f661
commit 0d1963b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -23,7 +23,7 @@ jobs:
         run: >
           DOCKER_BUILDKIT=1 docker build
           --target=test
-          --build-arg SDK_INTEGRATION_TESTS_SERVER_API_URL=${{ secrets.SDK_INTEGRATION_TESTS_SERVER_API_URL }}
-          --build-arg SDK_INTEGRATION_TESTS_SERVER_KEY_ID=${{ secrets.SDK_INTEGRATION_TESTS_SERVER_KEY_ID }}
-          --build-arg SDK_INTEGRATION_TESTS_SERVER_KEY_SECRET=${{ secrets.SDK_INTEGRATION_TESTS_SERVER_KEY_SECRET }}
+          --build-arg KEY=${{ secrets.KEY }}
+          --build-arg SECRET=${{ secrets.SECRET }}
+          --build-arg CONDUCTOR_SERVER_URL=${{ secrets.CONDUCTOR_SERVER_URL }}
           .
diff --git a/Conductor/Client/Worker/WorkflowTaskExecutor.cs b/Conductor/Client/Worker/WorkflowTaskExecutor.cs
@@ -81,7 +81,8 @@ private async Task Poll()
             }
             logger.LogDebug($"{GetWorkerName()} - Poll ended");
 
-            if (!hasPolledAnyTask) {
+            if (!hasPolledAnyTask)
+            {
                 await Sleep();
             }
         }

diff --git a/Dockerfile b/Dockerfile
@@ -1,23 +1,21 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS raw_base_image
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS csharp-sdk
 RUN mkdir /package
 COPY /Conductor /package/Conductor
 WORKDIR /package/Conductor
 
-FROM raw_base_image AS linter
+FROM csharp-sdk AS linter
 RUN dotnet format --verify-no-changes *.csproj
 
-FROM raw_base_image AS build
+FROM csharp-sdk AS build
 RUN dotnet build *.csproj
 
-FROM build as build_with_integration_tests_env
-ARG SDK_INTEGRATION_TESTS_SERVER_API_URL
-ENV SDK_INTEGRATION_TESTS_SERVER_API_URL=${SDK_INTEGRATION_TESTS_SERVER_API_URL}
-ARG SDK_INTEGRATION_TESTS_SERVER_KEY_ID
-ENV SDK_INTEGRATION_TESTS_SERVER_KEY_ID=${SDK_INTEGRATION_TESTS_SERVER_KEY_ID}
-ARG SDK_INTEGRATION_TESTS_SERVER_KEY_SECRET
-ENV SDK_INTEGRATION_TESTS_SERVER_KEY_SECRET=${SDK_INTEGRATION_TESTS_SERVER_KEY_SECRET}
-
-FROM build_with_integration_tests_env AS test
+FROM build as test
+ARG KEY
+ARG SECRET
+ARG CONDUCTOR_SERVER_URL
+ENV KEY=${KEY}
+ENV SECRET=${SECRET}
+ENV CONDUCTOR_SERVER_URL=${CONDUCTOR_SERVER_URL}
 COPY /Tests /package/Tests
 WORKDIR /package/Tests
 RUN dotnet test -l "console;verbosity=normal"

diff --git a/Tests/Util/ApiUtil.cs b/Tests/Util/ApiUtil.cs
@@ -8,9 +8,9 @@ namespace Tests.Util
 {
     public class ApiUtil
     {
-        private const string ENV_ROOT_URI = "SDK_INTEGRATION_TESTS_SERVER_API_URL";
-        private const string ENV_KEY_ID = "SDK_INTEGRATION_TESTS_SERVER_KEY_ID";
-        private const string ENV_SECRET = "SDK_INTEGRATION_TESTS_SERVER_KEY_SECRET";
+        private const string ENV_ROOT_URI = "CONDUCTOR_SERVER_URL";
+        private const string ENV_KEY_ID = "KEY";
+        private const string ENV_SECRET = "SECRET";
 
         private static string _basePath = null;
         private static string _keyId = null;