fix

DataDog · Jan 17, 2025 · adb0859 · adb0859
1 parent e68bc94
commit adb0859
Show file tree

Hide file tree

Showing 24 changed files with 5 additions and 4 deletions.
diff --git a/octopus_deploy/tests/conftest.py b/octopus_deploy/tests/conftest.py
@@ -100,6 +100,7 @@ def method(method, url, file='response', headers=None, params=None):
                 param_string += ("/" if param_string else "") + f'{key}={val_string}'
                 param_string = param_string.replace(':', '_')
                 param_string = param_string.replace('+00_00', '')
+                param_string = param_string.replace('2024-09-23 ', '')
             request_path = '{}/{}'.format(url, param_string)
         print(request_path)
         response = responses_map.get(method, {}).get(request_path, {}).get(filename)

diff --git a/octopus_deploy/tests/docker/Caddyfile b/octopus_deploy/tests/docker/Caddyfile
@@ -86,7 +86,7 @@
         expression {query.project}.contains("Projects-1") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate")
     }
     route @get_completed_tasks_project_1 {
-        rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json"
+        rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json"
         file_server
     }
     @get_completed_tasks_project_2 {
@@ -95,7 +95,7 @@
         expression {query.project}.contains("Projects-2") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate")
     }
     route @get_completed_tasks_project_2 {
-        rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json"
+        rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json"
         file_server
     }
     @get_completed_tasks_project_3 {
@@ -104,7 +104,7 @@
         expression {query.project}.contains("Projects-3") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate")
     }
     route @get_completed_tasks_project_3 {
-        rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json"
+        rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json"
         file_server
     }
     @get_completed_tasks_project_4 {
@@ -113,7 +113,7 @@
         expression {query.project}.contains("Projects-4") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate")
     }
     route @get_completed_tasks_project_4 {
-        rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json"
+        rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json"
         file_server
     }
     @get_octopusservernodes {

diff --git a/...Categories=[]/skip=0/take=2/response.json → ...Categories=[]/skip=0/take=2/response.json b/...Categories=[]/skip=0/take=2/response.json → ...Categories=[]/skip=0/take=2/response.json
diff --git a/...ategories=[]/skip=0/take=30/response.json → ...ategories=[]/skip=0/take=30/response.json b/...ategories=[]/skip=0/take=30/response.json → ...ategories=[]/skip=0/take=30/response.json
diff --git a/...Categories=[]/skip=0/take=2/response.json → ...Categories=[]/skip=0/take=2/response.json b/...Categories=[]/skip=0/take=2/response.json → ...Categories=[]/skip=0/take=2/response.json
diff --git a/...ategories=[]/skip=0/take=30/response.json → ...ategories=[]/skip=0/take=30/response.json b/...ategories=[]/skip=0/take=30/response.json → ...ategories=[]/skip=0/take=30/response.json
diff --git a/...Categories=[]/skip=2/take=2/response.json → ...Categories=[]/skip=2/take=2/response.json b/...Categories=[]/skip=2/take=2/response.json → ...Categories=[]/skip=2/take=2/response.json
diff --git a/..._45_00.123000/skip=0/take=2/response.json → ..._45_00.123000/skip=0/take=2/response.json b/..._45_00.123000/skip=0/take=2/response.json → ..._45_00.123000/skip=0/take=2/response.json
diff --git a/...45_00.123000/skip=0/take=30/response.json → ...45_00.123000/skip=0/take=30/response.json b/...45_00.123000/skip=0/take=30/response.json → ...45_00.123000/skip=0/take=30/response.json
diff --git a/..._45_15.123000/skip=0/take=2/response.json → ..._45_15.123000/skip=0/take=2/response.json b/..._45_15.123000/skip=0/take=2/response.json → ..._45_15.123000/skip=0/take=2/response.json
diff --git a/...45_15.123000/skip=0/take=30/response.json → ...45_15.123000/skip=0/take=30/response.json b/...45_15.123000/skip=0/take=30/response.json → ...45_15.123000/skip=0/take=30/response.json
diff --git a/..._45_00.123000/skip=0/take=2/response.json → ..._45_00.123000/skip=0/take=2/response.json b/..._45_00.123000/skip=0/take=2/response.json → ..._45_00.123000/skip=0/take=2/response.json
diff --git a/...45_00.123000/skip=0/take=30/response.json → ...45_00.123000/skip=0/take=30/response.json b/...45_00.123000/skip=0/take=30/response.json → ...45_00.123000/skip=0/take=30/response.json
diff --git a/..._45_15.123000/skip=0/take=2/response.json → ..._45_15.123000/skip=0/take=2/response.json b/..._45_15.123000/skip=0/take=2/response.json → ..._45_15.123000/skip=0/take=2/response.json
diff --git a/...45_15.123000/skip=0/take=30/response.json → ...45_15.123000/skip=0/take=30/response.json b/...45_15.123000/skip=0/take=30/response.json → ...45_15.123000/skip=0/take=30/response.json
diff --git a/..._45_00.123000/skip=0/take=2/response.json → ..._45_00.123000/skip=0/take=2/response.json b/..._45_00.123000/skip=0/take=2/response.json → ..._45_00.123000/skip=0/take=2/response.json
diff --git a/...45_00.123000/skip=0/take=30/response.json → ...45_00.123000/skip=0/take=30/response.json b/...45_00.123000/skip=0/take=30/response.json → ...45_00.123000/skip=0/take=30/response.json
diff --git a/..._45_15.123000/skip=0/take=2/response.json → ..._45_15.123000/skip=0/take=2/response.json b/..._45_15.123000/skip=0/take=2/response.json → ..._45_15.123000/skip=0/take=2/response.json
diff --git a/...45_15.123000/skip=0/take=30/response.json → ...45_15.123000/skip=0/take=30/response.json b/...45_15.123000/skip=0/take=30/response.json → ...45_15.123000/skip=0/take=30/response.json
diff --git a/..._45_15.123000/skip=2/take=2/response.json → ..._45_15.123000/skip=2/take=2/response.json b/..._45_15.123000/skip=2/take=2/response.json → ..._45_15.123000/skip=2/take=2/response.json
diff --git a/..._45_00.123000/skip=0/take=2/response.json → ..._45_00.123000/skip=0/take=2/response.json b/..._45_00.123000/skip=0/take=2/response.json → ..._45_00.123000/skip=0/take=2/response.json
diff --git a/...45_00.123000/skip=0/take=30/response.json → ...45_00.123000/skip=0/take=30/response.json b/...45_00.123000/skip=0/take=30/response.json → ...45_00.123000/skip=0/take=30/response.json
diff --git a/..._45_15.123000/skip=0/take=2/response.json → ..._45_15.123000/skip=0/take=2/response.json b/..._45_15.123000/skip=0/take=2/response.json → ..._45_15.123000/skip=0/take=2/response.json
diff --git a/...45_15.123000/skip=0/take=30/response.json → ...45_15.123000/skip=0/take=30/response.json b/...45_15.123000/skip=0/take=30/response.json → ...45_15.123000/skip=0/take=30/response.json