Merge pull request #814 from MetaCell/fix-jupyterhub-accounts-dep

CH-21 fix JupyerHub dependency on accounts

Author: filippomc

deployment/codefresh-test.yaml

@@ -13,26 +13,13 @@ steps:
     repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
     revision: '${{CF_BRANCH}}'
     git: github
-  post_main_clone:
-    title: Post main clone
-    type: parallel
-    stage: prepare
-    steps:
-      clone_cloud_harness:
-        title: Cloning cloud-harness repository...
-        type: git-clone
-        stage: prepare
-        repo: https://github.com/MetaCell/cloud-harness.git
-        revision: '${{CLOUDHARNESS_BRANCH}}'
-        working_directory: .
-        git: github
   prepare_deployment:
     title: Prepare helm chart
     image: python:3.12
     stage: prepare
     working_directory: .
     commands:
-    - bash cloud-harness/install.sh
+    - bash ./install.sh
     - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
       -rs ${{REGISTRY_SECRET}} -e test --write-env --cache-url '${{IMAGE_CACHE_URL}}'
       -N -i samples

libraries/cloudharness-common/cloudharness/auth/user_attributes.py

@@ -1,8 +1,6 @@
-import re
 from keycloak import KeycloakError
 from .keycloak import AuthClient
-from cloudharness.applications import get_current_configuration
-from cloudharness_model.models import ApplicationConfig
+from cloudharness.auth.exceptions import AuthSecretNotFound
 from cloudharness import log
 
 
@@ -123,7 +121,7 @@ def get_user_attributes(user_id: str = None, valid_keys={}, default_attributes={
         if not user_id:
             user_id = auth_client.get_current_user()["id"]
         user = auth_client.get_user(user_id, with_details=True)
-    except KeycloakError as e:
+    except (KeycloakError, AuthSecretNotFound) as e:
         log.warning("Quotas not available: error retrieving user: %s", user_id)
         raise UserNotFound("User not found") from e
 

libraries/cloudharness-common/cloudharness/infrastructure/k8s.py

@@ -76,7 +76,7 @@ def get_pod_logs(pod_name, namespace=namespace):
     except kubernetes.client.rest.ApiException as e:
         if e.status == 400:
             return f"Pod {pod_name} has not emitted logs yet..."
-        elif  400 < e.status < 500:
+        elif 400 < e.status < 500:
             return str(e)
         raise Exception(e.status) from e
 

libraries/models/cloudharness_model/models/backup_config.py

@@ -196,7 +196,7 @@ def schedule(self, schedule: str):
         :type schedule: str
         """
         if schedule is not None and not re.search(r'(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@every (\d+(ns|us|µs|ms|s|m|h))+)|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ?){5,7})', schedule):  # noqa: E501
-            raise ValueError("Invalid value for `schedule`, must be a follow pattern or equal to `/(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@every (\d+(ns|us|µs|ms|s|m|h))+)|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ?){5,7})/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `schedule`, must be a follow pattern or equal to `/(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@every (\d+(ns|us|µs|ms|s|m|h))+)|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ?){5,7})/`")  # noqa: E501
 
         self._schedule = schedule
 

libraries/models/cloudharness_model/models/deployment_auto_artifact_config.py

@@ -190,7 +190,7 @@ def image(self, image: str):
         :type image: str
         """
         if image is not None and not re.search(r'(?:[a-z]+\/)?([a-z]+)(?::[0-9]+)?', image):  # noqa: E501
-            raise ValueError("Invalid value for `image`, must be a follow pattern or equal to `/(?:[a-z]+\/)?([a-z]+)(?::[0-9]+)?/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `image`, must be a follow pattern or equal to `/(?:[a-z]+\/)?([a-z]+)(?::[0-9]+)?/`")  # noqa: E501
 
         self._image = image
 

libraries/models/cloudharness_model/models/deployment_auto_artifact_config_all_of.py

@@ -135,7 +135,7 @@ def image(self, image):
         :type image: str
         """
         if image is not None and not re.search(r'(?:[a-z]+\/)?([a-z]+)(?::[0-9]+)?', image):  # noqa: E501
-            raise ValueError("Invalid value for `image`, must be a follow pattern or equal to `/(?:[a-z]+\/)?([a-z]+)(?::[0-9]+)?/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `image`, must be a follow pattern or equal to `/(?:[a-z]+\/)?([a-z]+)(?::[0-9]+)?/`")  # noqa: E501
 
         self._image = image
 

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

@@ -130,7 +130,7 @@ def create_codefresh_deployment_scripts(root_paths, envs=(), include=(), exclude
     build_steps = {}
     has_overrides = any(DEFAULT_MERGE_PATH in root_path for root_path in root_paths)
     for i in range(len(root_paths)):
-            
+
         root_path = root_paths[i]
         base_name = clean_image_name(basename(abspath(root_path))) if i < len(root_paths) - (2 if has_overrides else 1) else base_image_name
 
@@ -160,7 +160,7 @@ def e2e_test_environment(app_config: ApplicationHarnessConfig, app_domain: str =
                 env = get_app_environment(app_config, app_domain, False)
                 return [f"{k}={env[k]}" for k in env]
 
-            def codefresh_app_build_spec(app_name, app_context_path, dockerfile_path="Dockerfile", base_name=None, 
+            def codefresh_app_build_spec(app_name, app_context_path, dockerfile_path="Dockerfile", base_name=None,
                                          helm_values: HarnessMainConfig = {}, dependencies=None, additional_tags=()):
                 logging.info('Generating build script for ' + app_name)
                 title = app_name.capitalize().replace(

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

@@ -149,7 +149,6 @@ def test_collect_helm_values_noreg_noinclude(tmp_path):
     assert values[KEY_TASK_IMAGES]['cloudharness-base'] == 'testprojectname/cloudharness-base:1'
     assert values[KEY_TASK_IMAGES]['myapp-mytask'] == 'testprojectname/myapp-mytask:1'
     assert values[KEY_TASK_IMAGES]['my-common'] == 'testprojectname/my-common:1'
-    
 
 
 def test_collect_helm_values_precedence(tmp_path):