Fix volumes in test spec

Author: filippomc

applications/workflows/api/openapi.yaml

@@ -8,9 +8,8 @@ info:
     license:
         name: UNLICENSED
 servers:
-    -
-        url: /api
-        description: Metacell host
+    - url: /api
+      description: Metacell host
 paths:
     /operations:
         get:

deployment/codefresh-test.yaml

@@ -385,7 +385,7 @@ steps:
         - pytest -v test/api
       common_api_test:
         volumes:
-        - '${{CF_REPO_NAME}}/applications/common/server:/home/test'
+        - '${{CF_REPO_NAME}}/applications/common:/home/test'
         - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
         environment:
         - APP_URL=https://common.${{CF_SHORT_REVISION}}.${{DOMAIN}}/api
@@ -394,7 +394,7 @@ steps:
           https://common.${{CF_SHORT_REVISION}}.${{DOMAIN}}/api -c all
       workflows_api_test:
         volumes:
-        - '${{CF_REPO_NAME}}/applications/workflows/server:/home/test'
+        - '${{CF_REPO_NAME}}/applications/workflows:/home/test'
         - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
         environment:
         - APP_URL=https://workflows.${{CF_SHORT_REVISION}}.${{DOMAIN}}/api

tools/cloudharness-test/cloudharness_test/apitest_init.py

@@ -17,6 +17,7 @@
         raise Exception(f"Cannot setup api tests: {openapi_uri} not reachable. Check your deployment is up and configuration") from e
 
     if "USERNAME" in os.environ and "PASSWORD" in os.environ:
+        logging.info("Setting token from username and password")
         @st.auth.register()
         class TokenAuth:
             def get(self, context):
@@ -26,6 +27,17 @@ def get(self, context):
 
                 return get_token(username, password)
 
+            def set(self, case, data, context):
+                case.headers = case.headers or {}
+                case.headers["Authorization"]  = f"Bearer {data}"
+                case.headers["Cookie"]  = f"kc-access={data}"
+    else:
+        @st.auth.register()
+        class TokenAuth:
+            def get(self, context):
+                
+                return ""
+
             def set(self, case, data, context):
                 case.headers = case.headers or {}
                 case.headers["Authorization"]  = f"Bearer {data}"

tools/deployment-cli-tools/ch_cli_tools/codefresh.py

@@ -11,7 +11,7 @@
 from cloudharness_utils.constants import *
 from .helm import KEY_APPS, KEY_TASK_IMAGES
 from .utils import find_dockerfiles_paths, get_app_relative_to_base_path, guess_build_dependencies_from_dockerfile, \
-    get_image_name, get_template, dict_merge, app_name_from_path
+    get_image_name, get_template, dict_merge, app_name_from_path, clean_path
 from cloudharness_utils.testing.api import get_api_filename, get_schemathesis_command, get_urls_from_api_file
 
 logging.getLogger().setLevel(logging.INFO)
@@ -92,9 +92,9 @@ def e2e_test_environment(app_config: ApplicationHarnessConfig, app_domain: str =
             def codefresh_steps_from_base_path(base_path, build_step, fixed_context=None, include=build_included, publish=True):
 
                 for dockerfile_path in find_dockerfiles_paths(base_path):
-                    app_relative_to_root = relpath(dockerfile_path, '.')
-                    app_relative_to_base = get_app_relative_to_base_path(base_path, dockerfile_path)
-                    app_name = app_name_from_path(app_relative_to_base)
+                    dockerfile_relative_to_root = relpath(dockerfile_path, '.')
+                    dockerfile_relative_to_base = get_app_relative_to_base_path(base_path, dockerfile_path)
+                    app_name = app_name_from_path(dockerfile_relative_to_base)
                     app_key = app_name.replace("-", "_")
                     app_config: ApplicationHarnessConfig = app_key in helm_values.apps and helm_values.apps[
                         app_key].harness
@@ -115,7 +115,7 @@ def codefresh_steps_from_base_path(base_path, build_step, fixed_context=None, in
                         build = codefresh_app_build_spec(
                             app_name=app_name,
                             app_context_path=relpath(
-                                fixed_context, '.') if fixed_context else app_relative_to_root,
+                                fixed_context, '.') if fixed_context else dockerfile_relative_to_root,
                             dockerfile_path=join(
                                 relpath(
                                     dockerfile_path, root_path) if fixed_context else '',
@@ -146,8 +146,8 @@ def codefresh_steps_from_base_path(base_path, build_step, fixed_context=None, in
 
                     if CD_API_TEST_STEP in steps and app_config and app_config.test.api.enabled:
                         tests_path = join(
-                            base_path, app_relative_to_base, "test", API_TESTS_DIRNAME)
-                        api_filename = get_api_filename(app_relative_to_base)
+                            base_path, dockerfile_relative_to_base, "test", API_TESTS_DIRNAME)
+                        api_filename = get_api_filename(dockerfile_relative_to_base)
                         if app_config.subdomain:
                             server_urls = get_urls_from_api_file(
                                 os.path.join(root_path, APPS_PATH, api_filename))
@@ -156,8 +156,8 @@ def codefresh_steps_from_base_path(base_path, build_step, fixed_context=None, in
                                     app_domain = get_app_domain(
                                         app_config) + app_domain
                                 steps[CD_API_TEST_STEP]['scale'][f"{app_name}_api_test"] = dict(
-                                    volumes=api_test_volumes(
-                                        app_relative_to_root),
+                                    volumes=api_test_volumes(clean_path(
+                                        dockerfile_relative_to_root)),
                                     environment=e2e_test_environment(
                                         app_config, app_domain),
                                     commands=api_tests_commands(
@@ -166,13 +166,13 @@ def codefresh_steps_from_base_path(base_path, build_step, fixed_context=None, in
 
                     if CD_E2E_TEST_STEP in steps and app_config and app_config.test.e2e.enabled:
                         tests_path = join(
-                            base_path, app_relative_to_base, "test", E2E_TESTS_DIRNAME)
+                            base_path, dockerfile_relative_to_base, "test", E2E_TESTS_DIRNAME)
 
                         if app_config.subdomain:
 
                             steps[CD_E2E_TEST_STEP]['scale'][f"{app_name}_e2e_test"] = dict(
                                 volumes=e2e_test_volumes(
-                                    app_relative_to_root, app_name),
+                                    clean_path(dockerfile_relative_to_root), app_name),
                                 environment=e2e_test_environment(app_config)
                             )
 

tools/deployment-cli-tools/tests/test_codefresh.py

@@ -236,6 +236,10 @@ def test_create_codefresh_configuration_tests():
         assert "-c all" in st_cmd, "Default check loaded is `all` on schemathesis command"
         assert "--hypothesis-deadline=" in st_cmd, "Custom parameters are loaded from values.yaml"
 
+        test_step = api_steps["common_api_test"]
+        for volume in test_step["volumes"]:
+            assert "server" not in volume
+
 
         assert any("CLOUDHARNESS_BASE" in arg for arg in st_build_test_steps["test-api"]
                    ["build_arguments"]), "Missing build dependency on api test image"