From 1789a1ad4358ca5e124796b27d1c3bdb59e17f33 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 23 Oct 2024 10:09:52 +0200 Subject: [PATCH] fix after review --- .drone.star | 2 ++ .../apiAntivirus/serviceAvailabilityCheck.feature | 4 ++-- .../apiCollaboration/serviceAvailabilityCheck.feature | 4 ++-- .../apiNotification/serviceAvailabilityCheck.feature | 4 ++-- .../serviceAvailability/serviceAvailabilityCheck.feature | 8 ++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.drone.star b/.drone.star index 660e31469f..d4f0d0fc85 100644 --- a/.drone.star +++ b/.drone.star @@ -241,6 +241,7 @@ config = { "extraServerEnvironment": { "GATEWAY_GRPC_ADDR": "0.0.0.0:9142", "COLLABORATION_DEBUG_ADDR": "0.0.0.0:9304", + "OCIS_ADD_RUN_SERVICES": "collaboration", }, }, "cliCommands": { @@ -2326,6 +2327,7 @@ def ocisServer(storage = "ocis", accounts_hash_difficulty = 4, volumes = [], dep "OCIS_JWT_SECRET": "some-ocis-jwt-secret", "EVENTHISTORY_STORE": "memory", "OCIS_TRANSLATION_PATH": "%s/tests/config/translations" % dirs["base"], + # debug addresses required for running services health tests "ACTIVITYLOG_DEBUG_ADDR": "0.0.0.0:9197", "APP_PROVIDER_DEBUG_ADDR": "0.0.0.0:9165", "APP_REGISTRY_DEBUG_ADDR": "0.0.0.0:9243", diff --git a/tests/acceptance/features/apiAntivirus/serviceAvailabilityCheck.feature b/tests/acceptance/features/apiAntivirus/serviceAvailabilityCheck.feature index 87e1273517..ddef3dc6c4 100644 --- a/tests/acceptance/features/apiAntivirus/serviceAvailabilityCheck.feature +++ b/tests/acceptance/features/apiAntivirus/serviceAvailabilityCheck.feature @@ -1,14 +1,14 @@ Feature: service health check - Scenario: health check + Scenario: check service health When a user requests these endpoints: | endpoint | service | | %base_url_without_scheme_and_port%:9297/healthz | antivirus | Then the HTTP status code of responses on all endpoints should be "200" - Scenario: ready check + Scenario: check service readiness When a user requests these endpoints: | endpoint | service | | %base_url_without_scheme_and_port%:9297/readyz | antivirus | diff --git a/tests/acceptance/features/apiCollaboration/serviceAvailabilityCheck.feature b/tests/acceptance/features/apiCollaboration/serviceAvailabilityCheck.feature index e121ad9281..6179496c06 100644 --- a/tests/acceptance/features/apiCollaboration/serviceAvailabilityCheck.feature +++ b/tests/acceptance/features/apiCollaboration/serviceAvailabilityCheck.feature @@ -1,14 +1,14 @@ Feature: service health check - Scenario: health check defauts service + Scenario: check service health When a user requests these endpoints: | endpoint | service | | %base_url_without_scheme_and_port%:9304/healthz | collaboration | Then the HTTP status code of responses on all endpoints should be "200" - Scenario: service ready check + Scenario: check service readiness When a user requests these endpoints: | endpoint | service | | %base_url_without_scheme_and_port%:9304/readyz | collaboration | diff --git a/tests/acceptance/features/apiNotification/serviceAvailabilityCheck.feature b/tests/acceptance/features/apiNotification/serviceAvailabilityCheck.feature index c88abf377c..4316534780 100644 --- a/tests/acceptance/features/apiNotification/serviceAvailabilityCheck.feature +++ b/tests/acceptance/features/apiNotification/serviceAvailabilityCheck.feature @@ -1,14 +1,14 @@ Feature: service health check - Scenario: health check + Scenario: check service health When a user requests these endpoints: | endpoint | service | | %base_url_without_scheme_and_port%:9174/healthz | notification | Then the HTTP status code of responses on all endpoints should be "200" - Scenario: ready check + Scenario: check service readiness When a user requests these endpoints: | endpoint | service | | %base_url_without_scheme_and_port%:9174/readyz | notification | diff --git a/tests/acceptance/features/serviceAvailability/serviceAvailabilityCheck.feature b/tests/acceptance/features/serviceAvailability/serviceAvailabilityCheck.feature index 98da89cded..14529bf374 100644 --- a/tests/acceptance/features/serviceAvailability/serviceAvailabilityCheck.feature +++ b/tests/acceptance/features/serviceAvailability/serviceAvailabilityCheck.feature @@ -1,7 +1,7 @@ Feature: service health check - Scenario: health check defauts service + Scenario: check default services health When a user requests these endpoints: | endpoint | service | comment | # | %base_url_without_scheme_and_port%:9197/healthz | activitylog | #get 500 | @@ -50,7 +50,7 @@ Feature: service health check Then the HTTP status code of responses on all endpoints should be "200" @env-config - Scenario: health check extra services + Scenario: check extra services health Given the following configs have been set: | config | value | | OCIS_ADD_RUN_SERVICES | audit,auth-app,auth-bearer,policies | @@ -67,7 +67,7 @@ Feature: service health check Then the HTTP status code of responses on all endpoints should be "200" - Scenario: service ready check + Scenario: check default services readiness When a user requests these endpoints: | endpoint | service | comment | # | %base_url_without_scheme_and_port%:9197/readyz | activitylog | #get 500 | @@ -116,7 +116,7 @@ Feature: service health check Then the HTTP status code of responses on all endpoints should be "200" @env-config - Scenario: health check extra services + Scenario: check extra services readiness Given the following configs have been set: | config | value | | OCIS_ADD_RUN_SERVICES | audit,auth-app,auth-bearer,policies |